General code cleanups

5 files changed, 19 insertions, 32 deletions

diff --git a/src/net/manaserv/itemhandler.cpp b/src/net/manaserv/itemhandler.cpp
index de5b36fa..870e7a9f 100644
--- a/src/net/manaserv/itemhandler.cpp
+++ b/src/net/manaserv/itemhandler.cpp
@@ -26,8 +26,6 @@
 #include "net/manaserv/manaserv_protocol.h"
 #include "net/manaserv/messagein.h"
 
-#include "log.h"
-
 namespace ManaServ {
 
 ItemHandler::ItemHandler()
diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp
index b8d3fa93..d69d3397 100644
--- a/src/net/manaserv/network.cpp
+++ b/src/net/manaserv/network.cpp
@@ -88,17 +88,13 @@ Connection *getConnection()
 void registerHandler(MessageHandler *handler)
 {
     for (const uint16_t *i = handler->handledMessages; *i; i++)
-    {
         mMessageHandlers[*i] = handler;
-    }
 }
 
 void unregisterHandler(MessageHandler *handler)
 {
     for (const uint16_t *i = handler->handledMessages; *i; i++)
-    {
         mMessageHandlers.erase(*i);
-    }
 }
 
 void clearNetworkHandlers()
diff --git a/src/net/tmwa/abilityhandler.cpp b/src/net/tmwa/abilityhandler.cpp
index e3e5d3bc..ab891b40 100644
--- a/src/net/tmwa/abilityhandler.cpp
+++ b/src/net/tmwa/abilityhandler.cpp
@@ -82,18 +82,15 @@ AbilityHandler::AbilityHandler()
 
 void AbilityHandler::handleMessage(MessageIn &msg)
 {
-    int skillCount;
-    int skillId;
-
     switch (msg.getId())
     {
-        case SMSG_PLAYER_SKILLS:
+        case SMSG_PLAYER_SKILLS: {
             msg.readInt16();  // length
-            skillCount = (msg.getLength() - 4) / 37;
+            const int skillCount = (msg.getLength() - 4) / 37;
 
             for (int k = 0; k < skillCount; k++)
             {
-                skillId = msg.readInt16();
+                int skillId = msg.readInt16();
                 msg.readInt16();  // target type
                 msg.skip(2);  // unused
                 int level = msg.readInt16();
@@ -107,10 +104,11 @@ void AbilityHandler::handleMessage(MessageIn &msg)
                     skillDialog->setModifiable(skillId, up);
             }
             break;
+        }
 
         case SMSG_PLAYER_SKILL_UP:
             {
-                skillId = msg.readInt16();
+                int skillId = msg.readInt16();
                 int level = msg.readInt16();
                 msg.readInt16(); // sp
                 msg.readInt16(); // range
@@ -124,20 +122,20 @@ void AbilityHandler::handleMessage(MessageIn &msg)
         case SMSG_SKILL_FAILED:
             // Action failed (ex. sit because you have not reached the
             // right level)
-            skillId   = msg.readInt16();
-            short bskill  = msg.readInt16();
-            msg.readInt16(); // unknown
-            char success = msg.readInt8();
-            char reason  = msg.readInt8();
-            if (success != SKILL_FAILED && bskill == BSKILL_EMOTE)
+            int skillId = msg.readInt16();
+            auto btype = msg.readInt16();
+            msg.readInt16();    // zero1
+            msg.readInt8();     // zero2
+            auto type  = msg.readInt8();
+            if (btype == BSKILL_EMOTE)
             {
-                logger->log("Action: %d/%d", bskill, success);
+                logger->log("Action: %d", btype);
             }
 
             std::string msg;
-            if (success == SKILL_FAILED && skillId == SKILL_BASIC)
+            if (skillId == SKILL_BASIC)
             {
-                switch (bskill)
+                switch (btype)
                 {
                     case BSKILL_TRADE:
                         msg = _("Trade failed!");
@@ -161,7 +159,7 @@ void AbilityHandler::handleMessage(MessageIn &msg)
 
                 msg += " ";
 
-                switch (reason)
+                switch (type)
                 {
                     case RFAIL_SKILLDEP:
                         msg += _("You have not yet reached a high enough lvl!");
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 49f0e26e..ce8231bd 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -37,7 +37,7 @@
 
 #include "utils/gettext.h"
 
-#include <list>
+#include <vector>
 
 namespace TmwAthena {
 
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 5a2dd0d0..353495da 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -331,20 +331,16 @@ void Network::disconnect()
 
 void Network::registerHandler(MessageHandler *handler)
 {
-    for (const Uint16 *i = handler->handledMessages; *i; ++i)
-    {
+    for (const uint16_t *i = handler->handledMessages; *i; ++i)
         mMessageHandlers[*i] = handler;
-    }
 
     handler->setNetwork(this);
 }
 
 void Network::unregisterHandler(MessageHandler *handler)
 {
-    for (const Uint16 *i = handler->handledMessages; *i; ++i)
-    {
+    for (const uint16_t *i = handler->handledMessages; *i; ++i)
         mMessageHandlers.erase(*i);
-    }
 
     handler->setNetwork(nullptr);
 }
@@ -352,9 +348,8 @@ void Network::unregisterHandler(MessageHandler *handler)
 void Network::clearHandlers()
 {
     for (auto& [_, messageHandler] : mMessageHandlers)
-    {
         messageHandler->setNetwork(nullptr);
-    }
+
     mMessageHandlers.clear();
 }