From 9a1dcc2f53444ab02f5bb81f886c29d5a0ddc46c Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sun, 29 May 2016 02:23:59 +1000 Subject: [PATCH] Set barrier bounds --- server/combat/barrier_data.cpp | 7 +++++++ server/combat/barrier_data.hpp | 1 + server/rooms/room_data.cpp | 1 + 3 files changed, 9 insertions(+) diff --git a/server/combat/barrier_data.cpp b/server/combat/barrier_data.cpp index 838071c..3fa222a 100644 --- a/server/combat/barrier_data.cpp +++ b/server/combat/barrier_data.cpp @@ -30,6 +30,13 @@ BarrierData::BarrierData(int i): { instanceIndex = i; memset(status, 0, sizeof(int) * 8); + + SetBounds({ + BARRIER_BOUNDS_X, + BARRIER_BOUNDS_Y, + BARRIER_BOUNDS_WIDTH, + BARRIER_BOUNDS_HEIGHT + }); } BarrierData::~BarrierData() { diff --git a/server/combat/barrier_data.hpp b/server/combat/barrier_data.hpp index bb9de50..f81bb3d 100644 --- a/server/combat/barrier_data.hpp +++ b/server/combat/barrier_data.hpp @@ -21,6 +21,7 @@ */ #pragma once +#include "barrier_defines.hpp" #include "entity.hpp" #include "lua.hpp" diff --git a/server/rooms/room_data.cpp b/server/rooms/room_data.cpp index 0561349..06068c4 100644 --- a/server/rooms/room_data.cpp +++ b/server/rooms/room_data.cpp @@ -152,6 +152,7 @@ void RoomData::RunFrame() { CombatInstance* instance = combatInstanceMgr.Find(barrierIt.second.GetInstanceIndex()); //... + std::cout << barrierIt.first << "\t" << barrierIt.second.GetInstanceIndex() << std::endl; //only confirm one barrier per character break;