Added some boilerplate

server/rooms/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. .. ../characters ../creatures ../entities ../monsters ../triggers ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../common/utilities
+INCLUDES+=. .. ../characters ../combat ../creatures ../entities ../monsters ../triggers ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

server/rooms/room_data.hpp

@@ -21,7 +21,9 @@
 */
 #pragma once
 
+#include "barrier_manager.hpp"
 #include "character_data.hpp"
+#include "combat_instance_manager.hpp"
 #include "creature_manager.hpp"
 #include "region_pager_lua.hpp"
 #include "trigger_manager.hpp"
@@ -74,7 +76,9 @@ private:
 
 	//members
 	int roomIndex = 0;
+	BarrierManager barrierMgr;
 	std::list<CharacterData*> characterList;
+	CombatInstanceManager CombatInstanceMgr;
 	CreatureManager creatureMgr;
 	RegionPagerLua pager;
 	TriggerManager triggerMgr;