Got rid of abstract storage and reference-counted pointers. Fixed lifetime of accounts and characters in server memory. Cleaned some code.

1 files changed, 8 insertions, 6 deletions

diff --git a/src/account-server/serverhandler.hpp b/src/account-server/serverhandler.hpp
index 5c57f03b..ec537dbd 100644
--- a/src/account-server/serverhandler.hpp
+++ b/src/account-server/serverhandler.hpp
@@ -26,9 +26,8 @@
 
 #include <map>
 #include "account-server/accounthandler.hpp"
-#include "account-server/characterdata.hpp"
+#include "account-server/character.hpp"
 #include "net/connectionhandler.hpp"
-#include "utils/countedptr.h"
 
 class AccountClient;
 
@@ -53,17 +52,20 @@ class ServerHandler: public ConnectionHandler
         /**
          * Sends a magic token and character data to the relevant game server.
          */
-        void registerGameClient(std::string const &, CharacterPtr);
-        
+        void registerGameClient(std::string const &, Character *);
+
+// There is no rationale for having a character name, but not its ID.
+#if 0
         /**
          * Get character (temp used by chat server).
          */
         CharacterPtr getCharacter(const std::string &name);
-        
+#endif
+
         /**
          * Make client join the specified guild channel
          */
-        void enterChannel(const std::string &guildName, CharacterData *player);
+        void enterChannel(const std::string &guildName, Character *player);
 
     protected:
         /**