Fixed a bunch of cppcheck warnings

21 files changed, 78 insertions, 93 deletions

diff --git a/src/account-server/account.h b/src/account-server/account.h
index 0ee8476..a359c11 100644
--- a/src/account-server/account.h
+++ b/src/account-server/account.h
@@ -36,6 +36,9 @@ class Account
     public:
         Account(int id = -1)
             : mID(id)
+            , mLevel(0)
+            , mRegistrationDate(0)
+            , mLastLogin(0)
         {}
 
         ~Account();
diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp
index b9397fe..a9905f7 100644
--- a/src/account-server/accounthandler.cpp
+++ b/src/account-server/accounthandler.cpp
@@ -382,10 +382,9 @@ void AccountHandler::handleLoginMessage(AccountClient &client, MessageIn &msg)
 
     // Check if the account exists
     Account *acc = 0;
-    std::list<Account*>::iterator ita;
-    for ( ita = mPendingAccounts.begin() ; ita != mPendingAccounts.end(); ita++ )
-        if ((*ita)->getName() == username)
-            acc = *ita;
+    for (Account *account : mPendingAccounts)
+        if (account->getName() == username)
+            acc = account;
     mPendingAccounts.remove(acc);
 
     if (!acc || sha256(acc->getPassword() + acc->getRandomSalt()) != password)
diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp
index dbf74d0..1ba3c03 100644
--- a/src/account-server/serverhandler.cpp
+++ b/src/account-server/serverhandler.cpp
@@ -213,12 +213,11 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
                 // transmit global world state variables
                 std::map<std::string, std::string> variables;
                 variables = storage->getAllWorldStateVars(Storage::WorldMap);
-                for (std::map<std::string, std::string>::iterator i = variables.begin();
-                     i != variables.end();
-                     i++)
+
+                for (auto &variableIt : variables)
                 {
-                    outMsg.writeString(i->first);
-                    outMsg.writeString(i->second);
+                    outMsg.writeString(variableIt.first);
+                    outMsg.writeString(variableIt.second);
                 }
 
                 comp->send(outMsg);
@@ -256,12 +255,10 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
                      // Map vars number
                     outMsg.writeInt16(variables.size());
 
-                    for (std::map<std::string, std::string>::iterator i = variables.begin();
-                         i != variables.end();
-                         i++)
+                    for (auto &variableIt : variables)
                     {
-                        outMsg.writeString(i->first);
-                        outMsg.writeString(i->second);
+                        outMsg.writeString(variableIt.first);
+                        outMsg.writeString(variableIt.second);
                     }
 
                     // Persistent Floor Items
@@ -393,14 +390,12 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
             // save the new value to the database
             storage->setWorldStateVar(name, value, Storage::WorldMap);
             // relay the new value to all gameservers
-            for (ServerHandler::NetComputers::iterator i = clients.begin();
-                i != clients.end();
-                i++)
+            for (NetComputer *netComputer : clients)
             {
                 MessageOut varUpdateMessage(AGMSG_SET_VAR_WORLD);
                 varUpdateMessage.writeString(name);
                 varUpdateMessage.writeString(value);
-                (*i)->send(varUpdateMessage);
+                netComputer->send(varUpdateMessage);
             }
         } break;
 
diff --git a/src/account-server/storage.cpp b/src/account-server/storage.cpp
index dd8cf9a..72f4fc0 100644
--- a/src/account-server/storage.cpp
+++ b/src/account-server/storage.cpp
@@ -288,7 +288,7 @@ void Storage::fixCharactersSlot(int accountId)
             }
         }
 
-        if (slotsToUpdate.size() > 0)
+        if (!slotsToUpdate.empty())
         {
             dal::PerformTransaction transaction(mDb);
 
@@ -776,7 +776,7 @@ bool Storage::updateCharacter(CharacterData *character)
     {
         std::map<int, int>::const_iterator kill_it;
         for (kill_it = character->getKillCountBegin();
-             kill_it != character->getKillCountEnd(); kill_it++)
+             kill_it != character->getKillCountEnd(); ++kill_it)
         {
             updateKillCount(character->getDatabaseID(),
                             kill_it->first, kill_it->second);
@@ -912,7 +912,7 @@ bool Storage::updateCharacter(CharacterData *character)
     {
         std::map<int, Status>::const_iterator status_it;
         for (status_it = character->getStatusEffectBegin();
-             status_it != character->getStatusEffectEnd(); status_it++)
+             status_it != character->getStatusEffectEnd(); ++status_it)
         {
             insertStatusEffect(character->getDatabaseID(),
                                status_it->first, status_it->second.time);
diff --git a/src/chat-server/chatclient.h b/src/chat-server/chatclient.h
index 7e8c4e2..79de000 100644
--- a/src/chat-server/chatclient.h
+++ b/src/chat-server/chatclient.h
@@ -38,10 +38,11 @@ class Party;
 class ChatClient : public NetComputer
 {
     public:
-        ChatClient(ENetPeer *peer):
-            NetComputer(peer),
-            party(0),
-            accountLevel(0)
+        ChatClient(ENetPeer *peer)
+            : NetComputer(peer)
+            , characterId(0)
+            , party(0)
+            , accountLevel(0)
         {
         }
 
diff --git a/src/chat-server/guild.cpp b/src/chat-server/guild.cpp
index 47ace46..e86130d 100644
--- a/src/chat-server/guild.cpp
+++ b/src/chat-server/guild.cpp
@@ -26,8 +26,9 @@
 
 #include <algorithm>
 
-Guild::Guild(const std::string &name) :
-    mName(name)
+Guild::Guild(const std::string &name)
+    : mId(0)
+    , mName(name)
 {
 }
 
diff --git a/src/chat-server/guildmanager.cpp b/src/chat-server/guildmanager.cpp
index 39b0bdb..b7f945d 100644
--- a/src/chat-server/guildmanager.cpp
+++ b/src/chat-server/guildmanager.cpp
@@ -29,10 +29,9 @@
 
 using namespace ManaServ;
 
-GuildManager::GuildManager()
+GuildManager::GuildManager():
+        mGuilds(storage->getGuildList())
 {
-    // Load stored guilds from db
-    mGuilds = storage->getGuildList();
 }
 
 GuildManager::~GuildManager()
diff --git a/src/chat-server/post.cpp b/src/chat-server/post.cpp
index 9da0753..e624889 100644
--- a/src/chat-server/post.cpp
+++ b/src/chat-server/post.cpp
@@ -24,7 +24,7 @@
 #include "../common/configuration.h"
 
 Letter::Letter(unsigned type, CharacterData *sender, CharacterData *receiver)
- : mId(0), mType(type), mSender(sender), mReceiver(receiver)
+ : mId(0), mType(type), mExpiry(0), mSender(sender), mReceiver(receiver)
 {
 }
 
diff --git a/src/common/permissionmanager.cpp b/src/common/permissionmanager.cpp
index b1c93c1..bd1767a 100644
--- a/src/common/permissionmanager.cpp
+++ b/src/common/permissionmanager.cpp
@@ -143,16 +143,15 @@ unsigned char PermissionManager::getMaskFromAlias(const std::string &alias)
 std::list<std::string> PermissionManager::getPermissionList(const Entity* character)
 {
     std::list<std::string> result;
-    std::map<std::string, unsigned char>::iterator i;
 
     unsigned char mask = character->getComponent<CharacterComponent>()
             ->getAccountLevel();
 
-    for (i = permissions.begin(); i != permissions.end(); i++)
+    for (auto &permissionIt : permissions)
     {
-        if (i->second & mask)
+        if (permissionIt.second & mask)
         {
-            result.push_back(i->first);
+            result.push_back(permissionIt.first);
         }
     }
 
@@ -162,17 +161,14 @@ std::list<std::string> PermissionManager::getPermissionList(const Entity* charac
 std::list<std::string> PermissionManager::getClassList(const Entity* character)
 {
     std::list<std::string> result;
-    std::map<std::string, unsigned char>::iterator i;
 
     unsigned char mask = character->getComponent<CharacterComponent>()
             ->getAccountLevel();
 
-    for (i = aliases.begin(); i != aliases.end(); i++)
+    for (auto &aliasIt : aliases)
     {
-        if (i->second & mask)
-        {
-            result.push_back(i->first);
-        }
+        if (aliasIt.second & mask)
+            result.push_back(aliasIt.first);
     }
 
     return result;
diff --git a/src/dal/sqlitedataprovider.cpp b/src/dal/sqlitedataprovider.cpp
index e267e38..2a08e9b 100644
--- a/src/dal/sqlitedataprovider.cpp
+++ b/src/dal/sqlitedataprovider.cpp
@@ -43,6 +43,7 @@ const std::string SqLiteDataProvider::CFGPARAM_SQLITE_DB_DEF = "mana.db";
 SqLiteDataProvider::SqLiteDataProvider()
     throw()
         : mDb(0)
+        , mStmt(0)
 {
 }
 
diff --git a/src/game-server/attribute.cpp b/src/game-server/attribute.cpp
index 71e5d94..f898b6e 100644
--- a/src/game-server/attribute.cpp
+++ b/src/game-server/attribute.cpp
@@ -394,7 +394,7 @@ void AttributeModifiersEffect::clearMods(double baseValue)
     mMod = mEffectType == Additive ? 0 : 1;
 }
 
-double Attribute::checkBounds(double baseValue)
+double Attribute::checkBounds(double baseValue) const
 {
     LOG_DEBUG("Checking bounds for value: " << baseValue);
     if (baseValue > mMaxValue)
diff --git a/src/game-server/attribute.h b/src/game-server/attribute.h
index 736e54a..2ac1378 100644
--- a/src/game-server/attribute.h
+++ b/src/game-server/attribute.h
@@ -195,7 +195,7 @@ class Attribute
          * Checks the min and max permitted values for the given base value
          * and return the adjusted value.
          */
-        double checkBounds(double baseValue);
+        double checkBounds(double baseValue) const;
 
         double mBase; // The attribute base value
         double mMinValue; // The min authorized base and derived attribute value
diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp
index 4ddec98..f3d4530 100644
--- a/src/game-server/being.cpp
+++ b/src/game-server/being.cpp
@@ -234,12 +234,11 @@ void BeingComponent::move(Entity &entity)
      * class has been used, because that seems to be the most logical
      * place extra functionality will be added.
      */
-    for (Path::iterator pathIterator = mPath.begin();
-            pathIterator != mPath.end(); pathIterator++)
+    for (Point &point : mPath)
     {
         const unsigned char walkmask =
                 entity.getComponent<ActorComponent>()->getWalkMask();
-        if (!map->getWalk(pathIterator->x, pathIterator->y, walkmask))
+        if (!map->getWalk(point.x, point.y, walkmask))
         {
             mPath.clear();
             break;
@@ -498,12 +497,10 @@ void BeingComponent::removeStatusEffect(int id)
 
 bool BeingComponent::hasStatusEffect(int id) const
 {
-    StatusEffects::const_iterator it = mStatus.begin();
-    while (it != mStatus.end())
+    for (auto &statusIt : mStatus)
     {
-        if (it->second.status->getId() == id)
+        if (statusIt.second.status->getId() == id)
             return true;
-        it++;
     }
     return false;
 }
@@ -566,12 +563,12 @@ void BeingComponent::update(Entity &entity)
         if (it->second.time <= 0 || mAction == DEAD)
         {
             StatusEffects::iterator removeIt = it;
-            it++; // bring this iterator to the safety of the next element
+            ++it; // bring this iterator to the safety of the next element
             mStatus.erase(removeIt);
         }
         else
         {
-            it++;
+            ++it;
         }
     }
 
diff --git a/src/game-server/commandhandler.cpp b/src/game-server/commandhandler.cpp
index dcdd8c6..4c210bf 100644
--- a/src/game-server/commandhandler.cpp
+++ b/src/game-server/commandhandler.cpp
@@ -198,13 +198,11 @@ static std::string playerRights(Entity *ch)
     std::stringstream str;
     str << (unsigned)ch->getComponent<CharacterComponent>()->getAccountLevel();
     str << " ( ";
-    std::list<std::string> classes =
-        PermissionManager::getClassList(ch);
-    for (std::list<std::string>::iterator i = classes.begin();
-         i != classes.end();
-         i++)
+    std::list<std::string> classes = PermissionManager::getClassList(ch);
+
+    for (std::string &permission : classes)
     {
-        str << (*i) << " ";
+        str << permission << " ";
     }
     str << ")";
     return str.str();
@@ -257,7 +255,7 @@ static std::string getArgument(std::string &args)
     }
     else
     {
-        argument = args.substr(0);
+        argument = args;
         args = std::string();
     }
     return argument;
@@ -269,12 +267,10 @@ static void handleHelp(Entity *player, std::string &args)
     {
         // short list of all commands
         say("=Available Commands=", player);
-        std::list<std::string> commands = PermissionManager::getPermissionList(player);
-        for (std::list<std::string>::iterator i = commands.begin();
-             i != commands.end();
-             i++)
+        for (std::string &command :
+                PermissionManager::getPermissionList(player))
         {
-            say((*i), player);
+            say(command, player);
         }
     } else {
         // don't show help for commands the player may not use
@@ -909,7 +905,7 @@ static void handleBan(Entity *player, std::string &args)
     // feedback for command user
     std::string otherName = other->getComponent<BeingComponent>()->getName();
     std::string msg = "You've banned " + otherName + " for " + utils::toString(length) + " minutes";
-    say(msg.c_str(), player);
+    say(msg, player);
     // log transaction
     msg = "User banned " + otherName + " for " + utils::toString(length) + " minutes";
     accountHandler->sendTransaction(characterComponent->getDatabaseID(),
@@ -1423,7 +1419,6 @@ static void handleCraft(Entity *player, std::string &args)
     std::stringstream errMsg;
     std::list<InventoryItem> recipe;
     Inventory playerInventory(player);
-    std::map<int, int> totalAmountOfItem;
 
     while (true)
     {
diff --git a/src/game-server/spawnareacomponent.cpp b/src/game-server/spawnareacomponent.cpp
index 54cb017..33bd5ac 100644
--- a/src/game-server/spawnareacomponent.cpp
+++ b/src/game-server/spawnareacomponent.cpp
@@ -58,7 +58,6 @@ void SpawnAreaComponent::update(Entity &entity)
         }
 
         // Find a free spawn location. Give up after 10 tries
-        int triesLeft = 10;
         Point position;
         const int x = mZone.x;
         const int y = mZone.y;
@@ -81,6 +80,7 @@ void SpawnAreaComponent::update(Entity &entity)
 
         if (being)
         {
+            int triesLeft = 10;
             do
             {
                 position = Point(x + rand() % width, y + rand() % height);
diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp
index db224b8..0b97ec0 100644
--- a/src/game-server/state.cpp
+++ b/src/game-server/state.cpp
@@ -110,7 +110,7 @@ static void serializeLooks(Entity *ch, MessageOut &msg)
         }
     }
 
-    if (lookChanges.size() > 0)
+    if (!lookChanges.empty())
     {
         // Number of look changes to send
         msg.writeInt8(lookChanges.size());
diff --git a/src/net/netcomputer.cpp b/src/net/netcomputer.cpp
index 8834f4a..5d86f13 100644
--- a/src/net/netcomputer.cpp
+++ b/src/net/netcomputer.cpp
@@ -34,7 +34,7 @@ NetComputer::NetComputer(ENetPeer *peer):
 {
 }
 
-bool NetComputer::isConnected()
+bool NetComputer::isConnected() const
 {
     return (mPeer->state == ENET_PEER_STATE_CONNECTED);
 }
diff --git a/src/net/netcomputer.h b/src/net/netcomputer.h
index 0984034..228b30e 100644
--- a/src/net/netcomputer.h
+++ b/src/net/netcomputer.h
@@ -40,7 +40,7 @@ class NetComputer
         /**
          * Returns <code>true</code> if this computer is connected.
          */
-        bool isConnected();
+        bool isConnected() const;
 
         /**
          * Disconnects the computer from the server, after sending a message.
diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp
index 2b9644d..1617f74 100644
--- a/src/scripting/luascript.cpp
+++ b/src/scripting/luascript.cpp
@@ -101,14 +101,12 @@ void LuaScript::push(const std::list<InventoryItem> &itemList)
     lua_createtable(mCurrentState, itemList.size(), 0);
     int itemTable = lua_gettop(mCurrentState);
 
-    for (std::list<InventoryItem>::const_iterator i = itemList.begin();
-         i != itemList.end();
-         i++)
+    for (const InventoryItem &inventoryItem : itemList)
     {
         // create the item structure
         std::map<std::string, int> item;
-        item["id"] = i->itemId;
-        item["amount"] = i->amount;
+        item["id"] = inventoryItem.itemId;
+        item["amount"] = inventoryItem.amount;
         pushSTLContainer<std::string, int>(mCurrentState, item);
         lua_rawseti(mCurrentState, itemTable, ++position);
     }
diff --git a/src/scripting/luautil.h b/src/scripting/luautil.h
index 8bcc2a3..26ed33c 100644
--- a/src/scripting/luautil.h
+++ b/src/scripting/luautil.h
@@ -230,7 +230,7 @@ void pushSTLContainer(lua_State *s, const std::list<T> &container)
     {
         push(s, *i);
         lua_rawseti(s, table, key);
-        i++;
+        ++i;
     }
 }
 
@@ -264,7 +264,7 @@ void pushSTLContainer(lua_State *s, const std::map<Tkey, Tval> &container)
         push(s, i->first);
         push(s, i->second);
         lua_settable(s, table);
-        i++;
+        ++i;
     }
 }
 
@@ -282,7 +282,7 @@ void pushSTLContainer(lua_State *s, const std::set<T> &container)
     {
         push(s, *i);
         lua_rawseti(s, table, key);
-        i++;
+        ++i;
     }
 }
 
diff --git a/src/utils/logger.cpp b/src/utils/logger.cpp
index 8a07057..50b0d4c 100644
--- a/src/utils/logger.cpp
+++ b/src/utils/logger.cpp
@@ -138,23 +138,23 @@ void Logger::setLogFile(const std::string &logFile, bool append)
 
 void Logger::output(const std::string &msg, Level atVerbosity)
 {
-    static const char *prefixes[] =
-    {
-#ifdef T_COL_LOG
-        "[\033[45mFTL\033[0m]",
-        "[\033[41mERR\033[0m]",
-        "[\033[43mWRN\033[0m]",
-#else
-        "[FTL]",
-        "[ERR]",
-        "[WRN]",
-#endif
-        "[INF]",
-        "[DBG]"
-    };
-
     if (mVerbosity >= atVerbosity)
     {
+        static const char *prefixes[] =
+        {
+        #ifdef T_COL_LOG
+            "[\033[45mFTL\033[0m]",
+            "[\033[41mERR\033[0m]",
+            "[\033[43mWRN\033[0m]",
+        #else
+            "[FTL]",
+            "[ERR]",
+            "[WRN]",
+        #endif
+            "[INF]",
+            "[DBG]"
+        };
+
         bool open = mLogFile.is_open();
 
         if (open)