From 25914cddf606e683a4226f46b56f800400d633d3 Mon Sep 17 00:00:00 2001 From: Guillaume Melquiond Date: Thu, 30 Aug 2007 16:20:33 +0000 Subject: Got rid of abstract storage and reference-counted pointers. Fixed lifetime of accounts and characters in server memory. Cleaned some code. --- src/account-server/serverhandler.hpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/account-server/serverhandler.hpp') 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 #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: /** -- cgit v1.2.3-60-g2f50