5 files changed, 8 insertions, 7 deletions
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 9cee4d434..7a66df305 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -151,7 +151,8 @@ void BuySellHandler::processNpcSell(Net::MessageIn &msg, int offset)
             const int value = msg.readInt32();
             msg.readInt32();  // value
 
-            const Item *const item = PlayerInfo::getInventory()->getItem(index);
+            const Item *const item = PlayerInfo::getInventory()
+                ->getItem(index);
 
             if (item && !(item->isEquipped()))
                 dialog->addItem(item, value);
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 679ff450d..69c27d792 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -318,7 +318,7 @@ void Network::setError(const std::string &error)
     mState = NET_ERROR;
 }
 
-uint16_t Network::readWord(int pos)
+uint16_t Network::readWord(const int pos) const
 {
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
     return SDL_Swap16((*(uint16_t*)(mInBuffer + (pos))));
diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index 913af7e6b..d61332fe1 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -84,7 +84,7 @@ class Network
 
         void setError(const std::string &error);
 
-        uint16_t readWord(int pos);
+        uint16_t readWord(const int pos) const;
 
         bool realConnect();
 
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 2d98eaa6a..69ccc59a4 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -202,7 +202,8 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
     msg.readInt16();                       // speed
     tempPlayer->setSubtype(msg.readInt16()); // class (used for race)
     const int hairStyle = msg.readInt16();
-    const uint16_t weapon = msg.readInt16();  // server not used it. may be need use?
+    const uint16_t weapon = msg.readInt16();
+
     tempPlayer->setSprite(SPRITE_WEAPON, weapon, "", 1, true);
 
     data.mAttributes[PlayerInfo::LEVEL] = msg.readInt16();
@@ -211,7 +212,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
     const int bottomClothes = msg.readInt16();
     const int shield = msg.readInt16();
 
-    int hat = msg.readInt16(); // head option top
+    const int hat = msg.readInt16(); // head option top
     const int topClothes = msg.readInt16();
 
     tempPlayer->setSprite(SPRITE_HAIR, hairStyle * -1,
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index f816c9e04..37ce67213 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -443,9 +443,8 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
     // An update about a player, potentially including movement.
     const int id = msg.readInt32();
     const short speed = msg.readInt16();
-    const uint16_t stunMode = msg.readInt16(); // opt1; Aethyra use this as cape
+    const uint16_t stunMode = msg.readInt16(); // opt1;
     uint32_t statusEffects = msg.readInt16(); // opt2;
-                                              // Aethyra use this as misc1
     statusEffects |= (static_cast<uint32_t>(msg.readInt16()))
         << 16; // status.options; Aethyra uses this as misc2
     const short job = msg.readInt16();