Merge branch 'network-expansion' into server-expansion

server/accounts/account_data.hpp

@@ -49,6 +49,7 @@ private:
 	std::string username;
 	//TODO: password
 
+	//bit fields?
 	bool blackListed = false;
 	bool whiteListed = true;
 	bool mod = false;

server/server_application.hpp

@@ -22,6 +22,18 @@
 #ifndef SERVERAPPLICATION_HPP_
 #define SERVERAPPLICATION_HPP_
 
+//managers
+#include "account_manager.hpp"
+#include "character_manager.hpp"
+#include "client_manager.hpp"
+#include "door_manager.hpp"
+#include "monster_manager.hpp"
+#include "room_manager.hpp"
+
+//utilities
+#include "config_utility.hpp"
+#include "udp_network_utility.hpp"
+
 //common utilities
 #include "serial_packet.hpp"
 #include "singleton.hpp"

server/server_logic.cpp

@@ -21,16 +21,6 @@
 */
 #include "server_application.hpp"
 
-//managers
-#include "account_manager.hpp"
-#include "character_manager.hpp"
-#include "client_manager.hpp"
-#include "room_manager.hpp"
-
-//utilities
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
-
 //utility functions
 #include "sql_tools.hpp"
 #include "utility.hpp"

server/server_methods.cpp

@@ -326,7 +326,7 @@ void ServerApplication::PumpPacket(SerialPacket* const argPacket) {
 	}
 }
 
-//??
+//SET: utility
 void ServerApplication::PumpCharacterUnload(int uid) {
 	//delete the client-side character(s)
 	//NOTE: This is a strange function