Minor tweaks, prepping for a merge

server/server_application.hpp

@@ -76,13 +76,15 @@ private:
 	//TODO: a function that only sends to characters in a certain proximity
 	void PumpPacket(SerialPacket);
 
-	//TODO: manage the database
+	//Account management
 	int CreateUserAccount(std::string username, int clientIndex);
 	int LoadUserAccount(std::string username, int clientIndex);
 	int SaveUserAccount(int uid);
 	void UnloadUserAccount(int uid);
 	void DeleteUserAccount(int uid);
 
+	//TODO: character management
+
 	//TODO: combat systems
 
 	//APIs
@@ -94,7 +96,7 @@ private:
 	std::map<int, ClientData> clientMap;
 	std::map<int, AccountData> accountMap;
 	std::map<int, CharacterData> characterMap;
-	std::map<int, CombatInstance> CombatMap;
+	std::map<int, CombatInstance> combatMap;
 
 	//maps
 	//TODO: I need to handle multiple map objects