More const correctness and small code cleanups

13 files changed, 65 insertions, 86 deletions

diff --git a/src/chat-server/chatchannel.cpp b/src/chat-server/chatchannel.cpp
index 5dd2b66..43ca1e9 100644
--- a/src/chat-server/chatchannel.cpp
+++ b/src/chat-server/chatchannel.cpp
@@ -112,13 +112,13 @@ void ChatChannel::setUserMode(ChatClient *user, unsigned char mode)
     }
 }
 
-std::string ChatChannel::getUserMode(ChatClient *user)
+std::string ChatChannel::getUserMode(ChatClient *user) const
 {
-    std::map<ChatChannel*, std::string>::iterator itr = user->userModes.find(this);
+    std::map<ChatChannel*, std::string>::const_iterator itr =
+            user->userModes.find(const_cast<ChatChannel*>(this));
+
     if (itr != user->userModes.end())
-    {
         return itr->second;
-    }
 
     return 0;
 }
diff --git a/src/chat-server/chatchannel.hpp b/src/chat-server/chatchannel.hpp
index 8a462dd..66ffb5b 100644
--- a/src/chat-server/chatchannel.hpp
+++ b/src/chat-server/chatchannel.hpp
@@ -65,13 +65,13 @@ class ChatChannel
         /**
          * Get the name of the channel.
          */
-        const std::string& getName() const
+        const std::string &getName() const
         { return mName; }
 
         /**
          * Get the announcement string of the channel.
          */
-        const std::string& getAnnouncement() const
+        const std::string &getAnnouncement() const
         { return mAnnouncement; }
 
         /**
@@ -101,7 +101,7 @@ class ChatChannel
         /**
          * Gets the list of the users registered in the channel.
          */
-        const ChannelUsers& getUserList() const
+        const ChannelUsers &getUserList() const
         { return mRegisteredUsers; }
 
         /**
@@ -136,7 +136,7 @@ class ChatChannel
         /**
          * Get user mode
          */
-        std::string getUserMode(ChatClient *);
+        std::string getUserMode(ChatClient *) const;
 
     private:
         unsigned short mId;            /**< The ID of the channel. */
diff --git a/src/chat-server/chatchannelmanager.cpp b/src/chat-server/chatchannelmanager.cpp
index bb9d3a7..f2c52e8 100644
--- a/src/chat-server/chatchannelmanager.cpp
+++ b/src/chat-server/chatchannelmanager.cpp
@@ -120,7 +120,8 @@ int ChatChannelManager::getChannelId(const std::string &channelName) const
             i_end = mChatChannels.end();
          i != i_end; ++i)
     {
-        if (i->second.getName() == channelName) return i->first;
+        if (i->second.getName() == channelName)
+            return i->first;
     }
     return 0;
 }
@@ -130,7 +131,7 @@ ChatChannel *ChatChannelManager::getChannel(int channelId)
     ChatChannels::iterator i = mChatChannels.find(channelId);
     if (i != mChatChannels.end())
         return &i->second;
-    return NULL;
+    return 0;
 }
 
 ChatChannel *ChatChannelManager::getChannel(const std::string &name)
@@ -139,12 +140,10 @@ ChatChannel *ChatChannelManager::getChannel(const std::string &name)
          i != mChatChannels.end(); ++i)
     {
         if (i->second.getName() == name)
-        {
             return &(i->second);
-        }
     }
 
-    return NULL;
+    return 0;
 }
 
 void ChatChannelManager::setChannelTopic(int channelId, const std::string &topic)
@@ -179,9 +178,15 @@ bool ChatChannelManager::channelExists(int channelId) const
     return mChatChannels.find(channelId) != mChatChannels.end();
 }
 
-bool ChatChannelManager::channelExists(const std::string &channelName)
+bool ChatChannelManager::channelExists(const std::string &channelName) const
 {
-    return getChannel(channelName) != NULL;
+    for (ChatChannels::const_iterator i = mChatChannels.begin();
+         i != mChatChannels.end(); ++i)
+    {
+        if (i->second.getName() == channelName)
+            return true;
+    }
+    return false;
 }
 
 int ChatChannelManager::nextUsable()
diff --git a/src/chat-server/chatchannelmanager.hpp b/src/chat-server/chatchannelmanager.hpp
index 096323b..739b428 100644
--- a/src/chat-server/chatchannelmanager.hpp
+++ b/src/chat-server/chatchannelmanager.hpp
@@ -34,14 +34,7 @@
 class ChatChannelManager
 {
     public:
-        /**
-         * Constructor.
-         */
         ChatChannelManager();
-
-        /**
-         * Destructor.
-         */
         ~ChatChannelManager();
 
         /**
@@ -114,7 +107,7 @@ class ChatChannelManager
          * @param channelId a channel ID
          */
         bool channelExists(int channelId) const;
-        bool channelExists(const std::string &channelName);
+        bool channelExists(const std::string &channelName) const;
 
         /**
          * Get next usable channel ID
diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index 95d2ed7..410c5b0 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -252,8 +252,7 @@ void ChatHandler::processMessage(NetComputer *comp, MessageIn &message)
         computer.send(result);
 }
 
-void
-ChatHandler::handleCommand(ChatClient &computer, const std::string &command)
+void ChatHandler::handleCommand(ChatClient &computer, const std::string &command)
 {
     LOG_INFO("Chat: Received unhandled command: " << command);
     MessageOut result;
@@ -262,8 +261,7 @@ ChatHandler::handleCommand(ChatClient &computer, const std::string &command)
     computer.send(result);
 }
 
-void
-ChatHandler::warnPlayerAboutBadWords(ChatClient &computer)
+void ChatHandler::warnPlayerAboutBadWords(ChatClient &computer)
 {
     // We could later count if the player is really often unpolite.
     MessageOut result;
@@ -274,8 +272,7 @@ ChatHandler::warnPlayerAboutBadWords(ChatClient &computer)
     LOG_INFO(computer.characterName << " says bad words.");
 }
 
-void
-ChatHandler::handleChatMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleChatMessage(ChatClient &client, MessageIn &msg)
 {
     std::string text = msg.readString();
 
@@ -309,8 +306,7 @@ ChatHandler::handleChatMessage(ChatClient &client, MessageIn &msg)
     storage->addTransaction(trans);
 }
 
-void
-ChatHandler::handleAnnounceMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleAnnounceMessage(ChatClient &client, MessageIn &msg)
 {
     std::string text = msg.readString();
 
@@ -349,8 +345,7 @@ ChatHandler::handleAnnounceMessage(ChatClient &client, MessageIn &msg)
 
 }
 
-void
-ChatHandler::handlePrivMsgMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handlePrivMsgMessage(ChatClient &client, MessageIn &msg)
 {
     std::string user = msg.readString();
     std::string text = msg.readString();
@@ -458,8 +453,7 @@ void ChatHandler::handleEnterChannelMessage(ChatClient &client, MessageIn &msg)
     client.send(reply);
 }
 
-void
-ChatHandler::handleModeChangeMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleModeChangeMessage(ChatClient &client, MessageIn &msg)
 {
     short channelId = msg.readShort();
     ChatChannel *channel = chatChannelManager->getChannel(channelId);
@@ -500,8 +494,7 @@ ChatHandler::handleModeChangeMessage(ChatClient &client, MessageIn &msg)
     storage->addTransaction(trans);
 }
 
-void
-ChatHandler::handleKickUserMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleKickUserMessage(ChatClient &client, MessageIn &msg)
 {
     short channelId = msg.readShort();
     ChatChannel *channel = chatChannelManager->getChannel(channelId);
@@ -538,8 +531,7 @@ ChatHandler::handleKickUserMessage(ChatClient &client, MessageIn &msg)
     storage->addTransaction(trans);
 }
 
-void
-ChatHandler::handleQuitChannelMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleQuitChannelMessage(ChatClient &client, MessageIn &msg)
 {
     MessageOut reply(CPMSG_QUIT_CHANNEL_RESPONSE);
 
@@ -581,8 +573,7 @@ ChatHandler::handleQuitChannelMessage(ChatClient &client, MessageIn &msg)
     client.send(reply);
 }
 
-void
-ChatHandler::handleListChannelsMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleListChannelsMessage(ChatClient &client, MessageIn &msg)
 {
     MessageOut reply(CPMSG_LIST_CHANNELS_RESPONSE);
 
@@ -607,8 +598,8 @@ ChatHandler::handleListChannelsMessage(ChatClient &client, MessageIn &msg)
     storage->addTransaction(trans);
 }
 
-void
-ChatHandler::handleListChannelUsersMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleListChannelUsersMessage(ChatClient &client,
+                                                MessageIn &msg)
 {
     MessageOut reply(CPMSG_LIST_CHANNELUSERS_RESPONSE);
 
@@ -639,8 +630,7 @@ ChatHandler::handleListChannelUsersMessage(ChatClient &client, MessageIn &msg)
     storage->addTransaction(trans);
 }
 
-void
-ChatHandler::handleTopicChange(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleTopicChange(ChatClient &client, MessageIn &msg)
 {
     short channelId = msg.readShort();
     std::string topic = msg.readString();
@@ -664,8 +654,7 @@ ChatHandler::handleTopicChange(ChatClient &client, MessageIn &msg)
     storage->addTransaction(trans);
 }
 
-void
-ChatHandler::handleDisconnectMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleDisconnectMessage(ChatClient &client, MessageIn &msg)
 {
     MessageOut reply(CPMSG_DISCONNECT_RESPONSE);
     reply.writeByte(ERRMSG_OK);
@@ -674,9 +663,9 @@ ChatHandler::handleDisconnectMessage(ChatClient &client, MessageIn &msg)
     client.send(reply);
 }
 
-void
-ChatHandler::sayToPlayer(ChatClient &computer, const std::string &playerName,
-                         const std::string &text)
+void ChatHandler::sayToPlayer(ChatClient &computer,
+                              const std::string &playerName,
+                              const std::string &text)
 {
     MessageOut result;
     LOG_DEBUG(computer.characterName << " says to " << playerName << ": "
@@ -717,16 +706,13 @@ void ChatHandler::sendInChannel(ChatChannel *channel, MessageOut &msg)
     }
 }
 
-ChatClient* ChatHandler::getClient(const std::string &name)
+ChatClient *ChatHandler::getClient(const std::string &name) const
 {
-    std::map<std::string, ChatClient*>::iterator itr;
-    itr = mPlayerMap.find(name);
+    std::map<std::string, ChatClient*>::const_iterator itr
+            = mPlayerMap.find(name);
+
     if (itr != mPlayerMap.end())
-    {
         return itr->second;
-    }
     else
-    {
-        return NULL;
-    }
+        return 0;
 }
diff --git a/src/chat-server/chathandler.hpp b/src/chat-server/chathandler.hpp
index fe14271..1cd4306 100644
--- a/src/chat-server/chathandler.hpp
+++ b/src/chat-server/chathandler.hpp
@@ -318,7 +318,7 @@ class ChatHandler : public ConnectionHandler
          * @param The name of the character
          * @return The Chat Client
          */
-        ChatClient *getClient(const std::string &name);
+        ChatClient *getClient(const std::string &name) const;
 
         /**
          * Set the topic of a guild channel
diff --git a/src/chat-server/party.hpp b/src/chat-server/party.hpp
index d09e53e..29bb7f2 100644
--- a/src/chat-server/party.hpp
+++ b/src/chat-server/party.hpp
@@ -48,12 +48,12 @@ public:
     /**
      * Return number of users in party
      */
-    unsigned int numUsers() { return mUsers.size(); }
+    unsigned int userCount() const { return mUsers.size(); }
 
     /**
      * Return the party id
      */
-    unsigned int getId() { return mId; }
+    unsigned int getId() const { return mId; }
 
 private:
     PartyUsers mUsers;
diff --git a/src/chat-server/partyhandler.cpp b/src/chat-server/partyhandler.cpp
index 04fb8fb..e9e4222 100644
--- a/src/chat-server/partyhandler.cpp
+++ b/src/chat-server/partyhandler.cpp
@@ -219,7 +219,7 @@ void ChatHandler::removeUserFromParty(ChatClient &client)
         informPartyMemberQuit(client);
 
         // if theres less than 1 member left, remove the party
-        if (client.party->numUsers() < 1)
+        if (client.party->userCount() < 1)
         {
             delete client.party;
             client.party = 0;
diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp
index d45edd1..258a702 100644
--- a/src/game-server/character.cpp
+++ b/src/game-server/character.cpp
@@ -530,15 +530,12 @@ void Character::incrementKillCount(int monsterType)
     };
 }
 
-int Character::getKillCount(int monsterType)
+int Character::getKillCount(int monsterType) const
 {
-    std::map<int, int>::iterator i = mKillCount.find(monsterType);
-    if (i == mKillCount.end())
-    {
-        return 0;
-    } else {
+    std::map<int, int>::const_iterator i = mKillCount.find(monsterType);
+    if (i != mKillCount.end())
         return i->second;
-    };
+    return 0;
 }
 
 
@@ -585,16 +582,16 @@ void Character::recalculateLevel()
     }
 }
 
-int Character::getExpNeeded(size_t skill)
+int Character::getExpNeeded(size_t skill) const
 {
     int level = getAttribute(skill);
     return Character::expForLevel(level + 1) - expForLevel(level);
 }
 
-int Character::getExpGot(size_t skill)
+int Character::getExpGot(size_t skill) const
 {
     int level = getAttribute(skill);
-    return mExperience[skill] - Character::expForLevel(level);
+    return mExperience.at(skill) - Character::expForLevel(level);
 }
 
 void Character::levelup()
diff --git a/src/game-server/character.hpp b/src/game-server/character.hpp
index 056b39f..7b74c08 100644
--- a/src/game-server/character.hpp
+++ b/src/game-server/character.hpp
@@ -330,7 +330,7 @@ class Character : public Being
         /**
          * Gets the number of monsters the character killed of a given type
          */
-        int getKillCount(int monsterType);
+        int getKillCount(int monsterType) const;
 
         /**
          * Shortcut to get being's health
@@ -403,12 +403,12 @@ class Character : public Being
         /**
          * Returns the exp needed for next skill levelup
          */
-        int getExpNeeded(size_t skill);
+        int getExpNeeded(size_t skill) const;
 
         /**
          * Returns the exp collected on this skill level
          */
-        int getExpGot(size_t skill);
+        int getExpGot(size_t skill) const;
 
         /**
          * Recalculates the character level
diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp
index b6d871d..9c8a5c6 100644
--- a/src/game-server/monster.cpp
+++ b/src/game-server/monster.cpp
@@ -295,7 +295,7 @@ void Monster::update()
     }
 }
 
-void Monster::loadScript(std::string &scriptName)
+void Monster::loadScript(const std::string &scriptName)
 {
     if (mScript)
     {
diff --git a/src/game-server/monster.hpp b/src/game-server/monster.hpp
index 6d145fc..e1737da 100644
--- a/src/game-server/monster.hpp
+++ b/src/game-server/monster.hpp
@@ -174,10 +174,10 @@ class MonsterClass
         const MonsterAttacks &getAttacks() const { return mAttacks; }
 
         /** sets the script file for the monster */
-        void setScript(std::string& filename) { mScript = filename; }
+        void setScript(const std::string &filename) { mScript = filename; }
 
         /** Returns script filename */
-        std::string &getScript() { return mScript; }
+        const std::string &getScript() const { return mScript; }
 
         /**
          * Randomly selects a monster drop (may return NULL).
@@ -241,7 +241,7 @@ class Monster : public Being
         /**
          * Returns monster specy.
          */
-        MonsterClass *getSpecy()
+        MonsterClass *getSpecy() const
         { return mSpecy; }
 
         /**
@@ -257,7 +257,7 @@ class Monster : public Being
         /**
          * Loads a script file for this monster
          */
-        void loadScript(std::string &scriptName);
+        void loadScript(const std::string &scriptName);
 
         /**
          *
diff --git a/src/game-server/postman.hpp b/src/game-server/postman.hpp
index d1de7f7..82b7a5a 100644
--- a/src/game-server/postman.hpp
+++ b/src/game-server/postman.hpp
@@ -22,6 +22,7 @@
 #define POSTMAN_H
 
 #include <map>
+#include <string>
 
 class Character;
 
@@ -35,15 +36,12 @@ struct PostCallback
 class PostMan
 {
 public:
-    Character* getCharacter(int id)
+    Character *getCharacter(int id) const
     {
-        std::map<int, Character*>::iterator itr = mCharacters.find(id);
+        std::map<int, Character*>::const_iterator itr = mCharacters.find(id);
         if (itr != mCharacters.end())
-        {
             return itr->second;
-        }
-
-        return NULL;
+        return 0;
     }
 
     void addCharacter(Character *player)