diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
| commit | 5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch) | |
| tree | de739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/account-server/serverhandler.cpp | |
| parent | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff) | |
| parent | d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff) | |
| download | manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2 manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/account-server/serverhandler.cpp')
| -rw-r--r-- | src/account-server/serverhandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp index 9ed317eb..dbf74d03 100644 --- a/src/account-server/serverhandler.cpp +++ b/src/account-server/serverhandler.cpp @@ -139,7 +139,7 @@ static GameServer *getGameServerFromMap(int mapId) if (it == server->maps.end()) continue; return server; } - return NULL; + return nullptr; } bool GameServerHandler::getGameServerFromMap(int mapId, @@ -432,7 +432,7 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg) int level = msg.readInt16(); // get the character so we can get the account id - CharacterData *c = storage->getCharacter(id, NULL); + CharacterData *c = storage->getCharacter(id, nullptr); if (c) { storage->setAccountLevel(c->getAccountID(), level); @@ -528,7 +528,7 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg) result.writeInt32(senderId); // get their characters - CharacterData *sender = storage->getCharacter(senderId, NULL); + CharacterData *sender = storage->getCharacter(senderId, nullptr); CharacterData *receiver = storage->getCharacter(receiverName); if (!sender || !receiver) { |