Arbitrary cleanups and marked GameHandler::getClientByNameSlow const

4 files changed, 18 insertions, 21 deletions

diff --git a/src/game-server/gamehandler.cpp b/src/game-server/gamehandler.cpp
index f8166f6..3081658 100644
--- a/src/game-server/gamehandler.cpp
+++ b/src/game-server/gamehandler.cpp
@@ -81,16 +81,16 @@ void GameHandler::computerDisconnected(NetComputer *comp)
 void GameHandler::kill(Character *ch)
 {
     GameClient *client = ch->getClient();
-    assert(client != NULL);
+    assert(client);
     client->character = NULL;
     client->status = CLIENT_LOGIN;
-    ch->setClient(NULL);
+    ch->setClient(0);
 }
 
 void GameHandler::prepareServerChange(Character *ch)
 {
     GameClient *client = ch->getClient();
-    assert(client != NULL);
+    assert(client);
     client->status = CLIENT_CHANGE_SERVER;
 }
 
@@ -643,7 +643,7 @@ void GameHandler::addPendingCharacter(const std::string &token, Character *ch)
     mTokenCollector.addPendingConnect(token, ch);
 }
 
-void GameHandler::tokenMatched(GameClient* computer, Character* character)
+void GameHandler::tokenMatched(GameClient *computer, Character *character)
 {
     computer->character = character;
     computer->status = CLIENT_CONNECTED;
@@ -677,10 +677,11 @@ void GameHandler::tokenMatched(GameClient* computer, Character* character)
     }
 }
 
-void GameHandler::deletePendingClient(GameClient* computer)
+void GameHandler::deletePendingClient(GameClient *computer)
 {
     // Something might have changed since it was inserted
-    if (computer->status != CLIENT_QUEUED) return;
+    if (computer->status != CLIENT_QUEUED)
+        return;
 
     MessageOut msg(GPMSG_CONNECT_RESPONSE);
     msg.writeByte(ERRMSG_TIME_OUT);
@@ -689,12 +690,12 @@ void GameHandler::deletePendingClient(GameClient* computer)
     computer->disconnect(msg);
 }
 
-void GameHandler::deletePendingConnect(Character* character)
+void GameHandler::deletePendingConnect(Character *character)
 {
     delete character;
 }
 
-GameClient *GameHandler::getClientByNameSlow(const std::string &name)
+GameClient *GameHandler::getClientByNameSlow(const std::string &name) const
 {
     for (NetComputers::const_iterator i = clients.begin(),
          i_end = clients.end(); i != i_end; ++i)
@@ -706,7 +707,7 @@ GameClient *GameHandler::getClientByNameSlow(const std::string &name)
             return c;
         }
     }
-    return NULL;
+    return 0;
 }
 
 void GameHandler::sendError(NetComputer *computer, int id, std::string errorMsg)
diff --git a/src/game-server/gamehandler.hpp b/src/game-server/gamehandler.hpp
index b4c8029..00e2912 100644
--- a/src/game-server/gamehandler.hpp
+++ b/src/game-server/gamehandler.hpp
@@ -94,28 +94,25 @@ class GameHandler: public ConnectionHandler
          * Combines a client with its character.
          * (Needed for TokenCollector)
          */
-        void
-        tokenMatched(GameClient* computer, Character* character);
+        void tokenMatched(GameClient *computer, Character *character);
 
         /**
          * Deletes a pending client's data.
          * (Needed for TokenCollector)
          */
-        void
-        deletePendingClient(GameClient* computer);
+        void deletePendingClient(GameClient *computer);
 
         /**
          * Deletes a pending connection's data.
          * (Needed for TokenCollector)
          */
-        void
-        deletePendingConnect(Character* character);
+        void deletePendingConnect(Character *character);
 
         /**
          * Gets the client associated to a character name. This method is slow,
          * so it should never be called for regular operations.
          */
-        GameClient *getClientByNameSlow(const std::string &);
+        GameClient *getClientByNameSlow(const std::string &) const;
 
     protected:
         NetComputer *computerConnected(ENetPeer *);
diff --git a/src/game-server/mapreader.cpp b/src/game-server/mapreader.cpp
index 00587ae..80a0646 100644
--- a/src/game-server/mapreader.cpp
+++ b/src/game-server/mapreader.cpp
@@ -94,7 +94,7 @@ bool MapReader::readMap(const std::string &filename, MapComposite *composite)
 
     xmlFreeDoc(doc);
 
-    if (map != NULL)
+    if (map)
     {
         composite->setMap(map);
 
@@ -267,7 +267,7 @@ Map* MapReader::readMap(xmlNodePtr node, const std::string &path,
                     }
 
                     MonsterClass *monster = MonsterManager::getMonster(monsterId);
-                    if (monster != NULL)
+                    if (monster)
                     {
                         things.push_back(new SpawnArea(composite, monster, rect, maxBeings, spawnRate));
                     }
diff --git a/src/game-server/monstermanager.cpp b/src/game-server/monstermanager.cpp
index 45772c6..3ad033f 100644
--- a/src/game-server/monstermanager.cpp
+++ b/src/game-server/monstermanager.cpp
@@ -112,8 +112,7 @@ void MonsterManager::reload()
         bool attributesSet = false;
         bool behaviorSet = false;
 
-        for (xmlNodePtr subnode = node->xmlChildrenNode; subnode != NULL;
-             subnode = subnode->next)
+        for_each_xml_child_node(subnode, node)
         {
             if (xmlStrEqual(subnode->name, BAD_CAST "drop"))
             {
@@ -286,5 +285,5 @@ void MonsterManager::deinitialize()
 MonsterClass *MonsterManager::getMonster(int id)
 {
     MonsterClasses::const_iterator i = monsterClasses.find(id);
-    return i != monsterClasses.end() ? i->second : NULL;
+    return i != monsterClasses.end() ? i->second : 0;
 }