From 01502372c95e33018c0449c65382bf18352d16ff Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Sat, 7 Mar 2015 15:09:19 +1100
Subject: [PATCH] Correcting a bug with unimplemented MonsterManager

---
 rsc/scripts/setup_server.lua        |  6 ++++++
 server/monsters/monster_manager.cpp | 22 +++++++++++-----------
 server/rooms/room_data.cpp          |  4 +---
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/rsc/scripts/setup_server.lua b/rsc/scripts/setup_server.lua
index 56084c4..b69b3b4 100644
--- a/rsc/scripts/setup_server.lua
+++ b/rsc/scripts/setup_server.lua
@@ -67,6 +67,12 @@ function dumpTrigger(t)
 	print(triggerSystem.Trigger.GetHandle(t), originX, originY, bx, by, bw, bh, s)
 end
 
+function dumpTable(t)
+	for k, v in pairs(t) do
+		print("", k, v)
+	end
+end
+
 --[[
 triggerMgr = roomSystem.Room.GetTriggerMgr(overworld)
 trigger1, uid1 = triggerSystem.TriggerManager.Create(triggerMgr, "handle1")
diff --git a/server/monsters/monster_manager.cpp b/server/monsters/monster_manager.cpp
index b0f3d11..cd54bc1 100644
--- a/server/monsters/monster_manager.cpp
+++ b/server/monsters/monster_manager.cpp
@@ -30,45 +30,45 @@ MonsterManager::~MonsterManager() {
 }
 
 int MonsterManager::Create(std::string) {
-	//Create
+	//TODO: (9) MonsterManager::Create()
 }
 
 void MonsterManager::Unload(int uid) {
-	//Unload
+	//TODO: (9) MonsterManager::Unload()
 }
 
 void MonsterManager::UnloadAll() {
-	//UnloadAll
+	//TODO: (9) MonsterManager::UnloadAll()
 }
 
 void MonsterManager::UnloadIf(std::function<bool(std::pair<const int, MonsterData const&>)> fn) {
-	//UnloadIf
+	//TODO: (9) MonsterManager::UnloadIf()
 }
 
 MonsterData* MonsterManager::Get(int uid) {
-	//Get
+	//TODO: (9) MonsterManager::Get()
 }
 
 int MonsterManager::GetLoadedCount() {
-	//GetLoadedCount
+	//TODO: (9) MonsterManager::GetLoadedCount()
 }
 
 std::map<int, MonsterData>* MonsterManager::GetContainer() {
-	//GetContainer
+	//TODO: (9) MonsterManager::GetContainer()
 }
 
 lua_State* MonsterManager::SetLuaState(lua_State* L) {
-	//SetLuaState
+	//TODO: (9) MonsterManager::SetLuaState()
 }
 
 lua_State* MonsterManager::GetLuaState() {
-	//GetLuaState
+	//TODO: (9) MonsterManager::GetLuaState()
 }
 
 sqlite3* MonsterManager::SetDatabase(sqlite3* db) {
-	//SetDatabase
+	//TODO: (9) MonsterManager::SetDatabase()
 }
 
 sqlite3* MonsterManager::GetDatabase() {
-	//GetDatabase
+	//TODO: (9) MonsterManager::GetDatabase()
 }
diff --git a/server/rooms/room_data.cpp b/server/rooms/room_data.cpp
index 4663735..1148a53 100644
--- a/server/rooms/room_data.cpp
+++ b/server/rooms/room_data.cpp
@@ -43,9 +43,7 @@ void RoomData::RunFrame() {
 	for (auto& it : characterList) {
 		it->Update();
 	}
-	for (auto& it : *monsterMgr.GetContainer()) {
-		it.second.Update();
-	}
+	//TODO: (3) iterate through the monster map
 
 	//compare the triggers to the entities, using their real hitboxes
 	for (auto& it : *triggerMgr.GetContainer()) {