Threaded barriers into the client, not yet queried

I've also refactored the rooms slightly.

server/combat/barrier_data.cpp

@@ -27,6 +27,7 @@
 BarrierData::BarrierData(int i):
 	Entity::Entity("barrier")
 {
+	instanceIndex = i;
 	memcpy(status, 0, sizeof(int) * 8);
 }
 

server/combat/barrier_data.hpp

@@ -50,7 +50,7 @@ private:
 	int scriptRef = LUA_NOREF;
 	std::map<std::string, std::string> tags;
 
-	int instanceIndex = -1;
+	int instanceIndex;
 
 	int status[8];
 };

server/rooms/room_data.cpp

@@ -46,67 +46,27 @@ void RoomData::RunFrame() {
 		lua_pop(lua, 1);
 	}
 
+	//lists of non-character entities that need updating client-side
+	std::list<std::pair<const int, CreatureData*>> creatureList;
+	std::list<std::pair<const int, BarrierData*>> barrierList;
+
 	//update the entities in the room
 	for (auto& it : characterList) {
 		it->Update();
 	}
+	creatureMgr.Update(&creatureList);
+	barrierMgr.Update(&barrierList);
 
-	//build a list of characters for use with the triggers
+	//build a list of entities for use with the triggers
 	std::stack<Entity*> entityStack;
 	for (auto& it : characterList) {
 		entityStack.push(it);
 	}
 
 	//Compare the triggers to the entities, using their real hitboxes
-	//NOTE: this stack solution should prevent problems when modifying the various lists
-	while(entityStack.size()) {
-		//get the entity & hitbox
-		Entity* entity = entityStack.top();
-		BoundingBox entityBox = entity->GetBounds() + entity->GetOrigin();
+	triggerMgr.Compare(entityStack);
 
-		//get the trigger pair & hitbox
-		for (auto& triggerPair : *triggerMgr.GetContainer()) {
-			BoundingBox triggerBox = triggerPair.second.GetBoundingBox() + triggerPair.second.GetOrigin();
-
-			//find all collisions
-			if (entityBox.CheckOverlap(triggerBox)) {
-				//skip members of the exclusion list
-				if (std::any_of(triggerPair.second.GetExclusionList()->begin(), triggerPair.second.GetExclusionList()->end(), [entity](Entity* ptr) -> bool {
-					return entity == ptr;
-				})) {
-					continue;
-				}
-
-				//run the trigger script
-				lua_rawgeti(lua, LUA_REGISTRYINDEX, triggerPair.second.GetScriptReference());
-				lua_pushlightuserdata(lua, entity);
-
-				if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
-					//error
-					throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-				}
-
-				//push to the exclusion list
-				triggerPair.second.GetExclusionList()->push_back(entity);
-			}
-			else {
-				//remove members of the exclusion list
-				//NOTE: characters in different rooms won't be removed, but that shouldn't be a problem
-				triggerPair.second.GetExclusionList()->remove_if([entity](Entity* ptr) -> bool {
-					return entity == ptr;
-				});
-			}
-		}
-
-		//next
-		entityStack.pop();
-	}
-
-	//a list of creatures that need to be updated client-side
-	std::list< std::pair<const int, CreatureData*>> creatureList;
-	creatureMgr.Update(&creatureList);
-
-	//send the updates
+	//set the creature updates
 	for (auto& it : creatureList) {
 		CreaturePacket packet;
 		copyCreatureToPacket(&packet, it.second, it.first);
@@ -115,10 +75,6 @@ void RoomData::RunFrame() {
 		pumpPacketProximity(reinterpret_cast<SerialPacket*>(&packet), roomIndex, it.second->GetOrigin(), INFLUENCE_RADIUS);
 	}
 
-	//a list of barriers that need to be updated client-side
-	std::list< std::pair<const int, BarrierData*>> barrierList;
-	barrierMgr.Update(&barrierList);
-
 	//send the updates
 	for (auto& it : barrierList) {
 		BarrierPacket packet;
@@ -128,7 +84,7 @@ void RoomData::RunFrame() {
 		pumpPacketProximity(reinterpret_cast<SerialPacket*>(&packet), roomIndex, it.second->GetOrigin(), INFLUENCE_RADIUS);
 	}
 
-	//TODO: creature/character collisions
+	//TODO: (0) creature/character collisions
 }
 
 std::string RoomData::SetName(std::string s) {

server/triggers/trigger_manager.cpp

@@ -29,6 +29,53 @@ TriggerManager::~TriggerManager() {
 	UnloadAll();
 }
 
+//Compare the triggers to the entities, using their real hitboxes
+void TriggerManager::Compare(std::stack<Entity*> entityStack) {
+	//NOTE: this stack solution should prevent problems when modifying the various lists
+	while(entityStack.size()) {
+		//get the entity & hitbox
+		Entity* entity = entityStack.top();
+		BoundingBox entityBox = entity->GetBounds() + entity->GetOrigin();
+
+		//get the trigger pair & hitbox
+		for (auto& triggerPair : elementMap) {
+			BoundingBox triggerBox = triggerPair.second.GetBoundingBox() + triggerPair.second.GetOrigin();
+
+			//find all collisions
+			if (entityBox.CheckOverlap(triggerBox)) {
+				//skip members of the exclusion list
+				if (std::any_of(triggerPair.second.GetExclusionList()->begin(), triggerPair.second.GetExclusionList()->end(), [entity](Entity* ptr) -> bool {
+					return entity == ptr;
+				})) {
+					continue;
+				}
+
+				//run the trigger script
+				lua_rawgeti(lua, LUA_REGISTRYINDEX, triggerPair.second.GetScriptReference());
+				lua_pushlightuserdata(lua, entity);
+
+				if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+					//error
+					throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+				}
+
+				//push to the exclusion list
+				triggerPair.second.GetExclusionList()->push_back(entity);
+			}
+			else {
+				//remove members of the exclusion list
+				//NOTE: characters in different rooms won't be removed, but that shouldn't be a problem
+				triggerPair.second.GetExclusionList()->remove_if([entity](Entity* ptr) -> bool {
+					return entity == ptr;
+				});
+			}
+		}
+
+		//next
+		entityStack.pop();
+	}
+}
+
 int TriggerManager::Create(std::string handle) {
 	//implicitly creates the element
 	TriggerData& triggerData = elementMap[counter];

server/triggers/trigger_manager.hpp

@@ -29,6 +29,7 @@
 
 #include <functional>
 #include <map>
+#include <stack>
 #include <string>
 
 class TriggerManager {
@@ -36,6 +37,8 @@ public:
 	TriggerManager();
 	~TriggerManager();
 
+	void Compare(std::stack<Entity*> entityStack);
+
 	//common public methods
 	int Create(std::string handle); //TODO: return the Trigger itself?
 	void Unload(int uid);