From 69a13c5ed64dd455db7103cac05ae163ef52ba1a Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Sat, 9 Jul 2016 20:14:07 +1000
Subject: [PATCH] Broke RoomData::RunFrame() into several parts for readability

---
 server/rooms/room_data.cpp | 29 ++++++++++++++++++++++++++++-
 server/rooms/room_data.hpp |  7 +++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/server/rooms/room_data.cpp b/server/rooms/room_data.cpp
index e4009f9..e642aa9 100644
--- a/server/rooms/room_data.cpp
+++ b/server/rooms/room_data.cpp
@@ -62,6 +62,17 @@
 
 //NOTE: character collisions should be preformed client-side
 void RoomData::RunFrame() {
+	RunFrameUpdates(RunFrameLuaOnTick());
+	RunFrameTriggers();
+	RunFrameCharacterCreatureCollisions();
+	RunFrameCharacterBarrierCollisions();
+}
+
+//-------------------------
+//hi-cohesion methods for one-time use
+//-------------------------
+
+bool RoomData::RunFrameLuaOnTick() {
 	//get the hook
 	lua_rawgeti(lua, LUA_REGISTRYINDEX, tickRef);
 
@@ -75,7 +86,7 @@ void RoomData::RunFrame() {
 		}
 
 		//pump creatures & barriers
-		if (lua_tonumber(lua, -1)) {
+		if (lua_tonumber(lua, -1) > 0) {
 			updateAll = true;
 		}
 
@@ -85,6 +96,10 @@ void RoomData::RunFrame() {
 		lua_pop(lua, 1);
 	}
 
+	return updateAll;
+}
+
+void RoomData::RunFrameUpdates(bool updateAll) {
 	//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;
@@ -118,8 +133,12 @@ void RoomData::RunFrame() {
 	}
 
 	//TODO: send the combat instance updates
+}
 
+void RoomData::RunFrameTriggers() {
+	
 	//build a list of entities for use with the triggers
+	//currently, this only uses characters
 	std::stack<Entity*> entityStack;
 	for (auto& it : characterList) {
 		entityStack.push(it);
@@ -127,7 +146,9 @@ void RoomData::RunFrame() {
 
 	//Compare the triggers to the entities, using their real hitboxes
 	triggerMgr.Compare(entityStack);
+}
 
+void RoomData::RunFrameCharacterCreatureCollisions() {
 	//Creature/character collisions, O(m*n), making the barriers
 	for (auto characterIt : characterList) {
 		BoundingBox characterBox = characterIt->GetBounds() + characterIt->GetOrigin();
@@ -171,7 +192,9 @@ void RoomData::RunFrame() {
 			creatureMgr.Unload(it);
 		}
 	}
+}
 
+void RoomData::RunFrameCharacterBarrierCollisions() {
 	//TODO: check for character collisions with barriers, O(m*n)
 	for (auto characterIt : characterList) {
 		BoundingBox characterBox = characterIt->GetBounds() + characterIt->GetOrigin();
@@ -193,6 +216,10 @@ void RoomData::RunFrame() {
 	}
 }
 
+//-------------------------
+//Utility methods
+//-------------------------
+
 std::string RoomData::SetName(std::string s) {
 	return roomName = s;
 }
diff --git a/server/rooms/room_data.hpp b/server/rooms/room_data.hpp
index ab6dfa4..91179e5 100644
--- a/server/rooms/room_data.hpp
+++ b/server/rooms/room_data.hpp
@@ -74,6 +74,13 @@ public:
 	std::string GetTag(std::string key);
 
 private:
+	//hi-cohesion methods for one-time use
+	bool RunFrameLuaOnTick();
+	void RunFrameUpdates(bool updateAll);
+	void RunFrameTriggers();
+	void RunFrameCharacterCreatureCollisions();
+	void RunFrameCharacterBarrierCollisions();
+
 	//metadata
 	std::string roomName;
 	std::string tilesetName;