Merge branch 'develop' (read more)

Deleted in the merge:
* combat_management.cpp
* todo.txt

Amended in the merge:
* server/enemy_factory_interface.hpp
* server/server_application.hpp
* server/server_internals.cpp

That version of combat_management.cpp was not what I was looking for. I'll
try again, this time by working my way down from SerialPacket. It's worked
in the past as far as establishing a standard goes.

todo.txt was deleted in this commit, but will be carried over into the
next develop branch.

I'll release a new demo build without changing the version number, since
there are no functional changes.

server/server_application.hpp

@@ -26,6 +26,8 @@
 #include "client_data.hpp"
 #include "account_data.hpp"
 #include "character_data.hpp"
+#include "combat_data.hpp"
+#include "enemy_factory_generic.hpp"
 
 //maps
 #include "map_allocator.hpp"
@@ -51,6 +53,7 @@
 #include <string>
 
 //The main application class
+//TODO: modulate this god class
 class ServerApplication {
 public:
 	//standard functions
@@ -84,14 +87,14 @@ private:
 	void UnloadUserAccount(int uid);
 	void DeleteUserAccount(int uid);
 
-	//TODO: character management
+	//character management
 	int CreateCharacter(int owner, std::string handle, std::string avatar);
 	int LoadCharacter(int owner, std::string handle, std::string avatar);
 	int SaveCharacter(int uid);
 	void UnloadCharacter(int uid);
 	void DeleteCharacter(int uid);
 
-	//TODO: combat systems
+	//TODO: combat management
 
 	//APIs
 	UDPNetworkUtility network;
@@ -102,11 +105,13 @@ private:
 	std::map<int, ClientData> clientMap;
 	std::map<int, AccountData> accountMap;
 	std::map<int, CharacterData> characterMap;
+	std::map<int, CombatData> combatMap;
 
 	//maps
 	//TODO: I need to handle multiple map objects
 	//TODO: Unload regions that are distant from any characters
 	RegionPager<LuaAllocator, LuaFormat> regionPager;
+	EnemyFactoryGeneric enemyFactory;
 
 	//misc
 	bool running = true;