From cfdc61c3571e70651faba8d41e260343176cbc29 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Thu, 6 Nov 2014 00:04:42 +1100
Subject: [PATCH] Tweaked TODO comments

---
 server/clients/client_manager.cpp   | 24 ++++++++++----------
 server/doors/door_manager.cpp       | 24 ++++++++++----------
 server/monsters/monster_manager.cpp | 32 +++++++++++++--------------
 server/rooms/room_data.hpp          |  6 ++++-
 todo.txt                            | 34 +++++------------------------
 5 files changed, 47 insertions(+), 73 deletions(-)

diff --git a/server/clients/client_manager.cpp b/server/clients/client_manager.cpp
index e61090d..8fa0cb1 100644
--- a/server/clients/client_manager.cpp
+++ b/server/clients/client_manager.cpp
@@ -21,48 +21,46 @@
 */
 #include "client_manager.hpp"
 
-//TODO: client_manager.cpp
-
 int ClientManager::Create(IPaddress add) {
-	//
+	//TODO
 }
 
 int ClientManager::Load(IPaddress add) {
-	//
+	//TODO
 }
 
 int ClientManager::Save(int uid) {
-	//
+	//TODO
 }
 
 void ClientManager::Unload(int uid) {
-	//
+	//TODO
 }
 
 void ClientManager::Delete(int uid) {
-	//
+	//TODO
 }
 
 void ClientManager::UnloadAll() {
-	//
+	//TODO
 }
 
 void ClientManager::UnloadIf(std::function<bool(std::pair<const int, ClientData>)> fn) {
-	//
+	//TODO
 }
 
 ClientData* ClientManager::Get(int uid) {
-	//
+	//TODO
 }
 
 int ClientManager::GetLoadedCount() {
-	//
+	//TODO
 }
 
 int ClientManager::GetTotalCount() {
-	//
+	//TODO
 }
 
 std::map<int, ClientData>* ClientManager::GetContainer() {
-	//
+	//TODO
 }
\ No newline at end of file
diff --git a/server/doors/door_manager.cpp b/server/doors/door_manager.cpp
index 8a16211..bf264aa 100644
--- a/server/doors/door_manager.cpp
+++ b/server/doors/door_manager.cpp
@@ -21,48 +21,46 @@
 */
 #include "door_manager.hpp"
 
-//TODO: door_manager.cpp
-
 int DoorManager::Create(std::string, Vector2) {
-	//
+	//TODO
 }
 
 int DoorManager::Load(std::string, Vector2) {
-	//
+	//TODO
 }
 
 int DoorManager::Save(int uid) {
-	//
+	//TODO
 }
 
 void DoorManager::Unload(int uid) {
-	//
+	//TODO
 }
 
 void DoorManager::Delete(int uid) {
-	//
+	//TODO
 }
 
 void DoorManager::UnloadAll() {
-	//
+	//TODO
 }
 
 void DoorManager::UnloadIf(std::function<bool(std::pair<const int, DoorData>)> fn) {
-	//
+	//TODO
 }
 
 DoorData* DoorManager::Get(int uid) {
-	//
+	//TODO
 }
 
 int DoorManager::GetLoadedCount() {
-	//
+	//TODO
 }
 
 int DoorManager::GetTotalCount() {
-	//
+	//TODO
 }
 
 std::map<int, DoorData>* DoorManager::GetContainer() {
-	//
+	//TODO
 }
diff --git a/server/monsters/monster_manager.cpp b/server/monsters/monster_manager.cpp
index 2df1f5e..1b2f885 100644
--- a/server/monsters/monster_manager.cpp
+++ b/server/monsters/monster_manager.cpp
@@ -21,64 +21,62 @@
 */
 #include "monster_manager.hpp"
 
-//TODO: monster_manager.cpp
-
 int MonsterManager::Create(std::string) {
-	//
+	//TODO
 }
 
 int MonsterManager::Load(std::string) {
-	//
+	//TODO
 }
 
 int MonsterManager::Save(int uid) {
-	//
+	//TODO
 }
 
 void MonsterManager::Unload(int uid) {
-	//
+	//TODO
 }
 
 void MonsterManager::Delete(int uid) {
-	//
+	//TODO
 }
 
 void MonsterManager::UnloadAll() {
-	//
+	//TODO
 }
 
 void MonsterManager::UnloadIf(std::function<bool(std::pair<const int, MonsterData>)> fn) {
-	//
+	//TODO
 }
 
 MonsterData* MonsterManager::Get(int uid) {
-	//
+	//TODO
 }
 
 int MonsterManager::GetLoadedCount() {
-	//
+	//TODO
 }
 
 int MonsterManager::GetTotalCount() {
-	//
+	//TODO
 }
 
 std::map<int, MonsterData>* MonsterManager::GetContainer() {
-	//
+	//TODO
 }
 
 sqlite3* MonsterManager::SetDatabase(sqlite3* db) {
-	//
+	//TODO
 }
 
 sqlite3* MonsterManager::GetDatabase() {
-	//
+	//TODO
 }
 
 lua_State* MonsterManager::SetLuaState(lua_State* L) {
-	//
+	//TODO
 }
 
 lua_State* MonsterManager::GetLuaState() {
-	//
+	//TODO
 }
diff --git a/server/rooms/room_data.hpp b/server/rooms/room_data.hpp
index 5c9de55..9f38cbb 100644
--- a/server/rooms/room_data.hpp
+++ b/server/rooms/room_data.hpp
@@ -25,7 +25,11 @@
 #include "entity.hpp"
 #include "region_pager_lua.hpp"
 
-#include "lua.hpp"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
+#endif
 
 #include <list>
 #include <string>
diff --git a/todo.txt b/todo.txt
index ab0e4a9..d764117 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,40 +1,16 @@
-TODO: Get the rooms working, even if only via hotkeys
+TODO: client_manager.cpp
+TODO: door_manager.cpp
+TODO: monster_manager.cpp
+
 TODO: I need a better way to handle the statistics
-TODO: SerialPacketType::CHARACTER_LOCATION, CHARACTER_MOVE, CHARACTER_TELEPORT, ROOM_CHANGE, etc.
 TODO: Fix shoddy movement
 TODO: Handle statistics server-side
 TODO: Periodic mass server saves
 
 TODO: Remove the big "Shut Down" button
 TODO: Make a way for the server owner to control the server directly
-TODO: Move the map system into it's own namespace?
 TODO: The TileSheet class should implement the surface itself
-TODO: make the whole thing more fault tolerant
-TODO: Authentication
-
+TODO: Passwords/Authentication
 TODO: Time delay for requesting region packets
 TODO: A proper logging system
 TODO: Update Codebase with the improvements from Tortuga
-
--------------------------
-Serial Packet Types
--------------------------
-
-//character management
-* CHARACTER_CREATE //make this character
-* CHARACTER_DELETE //unmake this character
-* CHARACTER_LOAD //load this character into the world
-* CHARACTER_UNLOAD //unload this character from the world
-
-//find out info from the server
-* CHARACTER_QUERY_EXISTS //also sends the owner's info
-* CHARACTER_QUERY_LOCATION
-* CHARACTER_get all the entities within a distance of this
-
-//set the info in the server
-* CHARACTER_SET_ORIGIN
-* CHARACTER_SET_MOTION
-
-//authentication, character index => character stats
-CHARACTER_STATS_REQUEST
-CHARACTER_STATS_RESPONSE