diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-15 22:15:31 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-15 22:15:31 +0200 |
| commit | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (patch) | |
| tree | 1a8174f4d1745a4799210db970aa2230df622d34 /src/account-server/serverhandler.h | |
| parent | b89e404f85358f2e3ff87d7731376dbeacdf9778 (diff) | |
| parent | 81be8dc99ba7558c8915310eed095df43e3bdbf7 (diff) | |
| download | manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.gz manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.bz2 manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.xz manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/account-server/accounthandler.cpp
src/game-server/character.cpp
Diffstat (limited to 'src/account-server/serverhandler.h')
| -rw-r--r-- | src/account-server/serverhandler.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/account-server/serverhandler.h b/src/account-server/serverhandler.h index f4499f1b..6f4c61fe 100644 --- a/src/account-server/serverhandler.h +++ b/src/account-server/serverhandler.h @@ -26,7 +26,7 @@ #include "net/messagein.h" -class Character; +class CharacterData; namespace GameServerHandler { @@ -49,7 +49,7 @@ namespace GameServerHandler /** * Warns a game server about a soon-to-connect client. */ - void registerClient(const std::string &token, Character *); + void registerClient(const std::string &token, CharacterData *); /** * Dumps per-server statistics into given stream @@ -64,7 +64,7 @@ namespace GameServerHandler /** * Sends chat party information */ - void sendPartyChange(Character *ptr, int partyId); + void sendPartyChange(CharacterData *ptr, int partyId); /** * Takes a GAMSG_PLAYER_SYNC from the gameserver and stores all changes in |