Continue fix for shadow variables/methods errors.

3 files changed, 8 insertions, 8 deletions

diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index a332b04fa..5d5034938 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -89,7 +89,7 @@ void AdminHandler::localAnnounce(const std::string &text)
     outMsg.writeString(text, static_cast<int>(text.length()));
 }
 
-void AdminHandler::hide(bool hide A_UNUSED)
+void AdminHandler::hide(bool h A_UNUSED)
 {
     MessageOut outMsg(CMSG_ADMIN_HIDE);
     outMsg.writeInt32(0); //unused
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 79f41dece..53fd4831f 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -50,7 +50,7 @@ class AdminHandler : public MessageHandler, public Ea::AdminHandler
 
         void localAnnounce(const std::string &text);
 
-        void hide(bool hide);
+        void hide(bool h);
 
         void kick(int playerId);
 };
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index c087ab43d..845c30f19 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -445,7 +445,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
     Being *dstBeing;
     int hairStyle, hairColor;
     unsigned char colors[9];
-    Uint8 dir;
+
 
     // An update about a player, potentially including movement.
     int id = msg.readInt32();
@@ -469,7 +469,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
             return;
     }
 
-    dir = dstBeing->getDirectionDelayed();
+    Uint8 dir = dstBeing->getDirectionDelayed();
     if (dir)
     {
         if (dir != dstBeing->getDirection())
@@ -568,10 +568,10 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
 
         if (srcX != dstX || srcY != dstY)
         {
-            int dir = dstBeing->calcDirection(dstX, dstY);
+            int d = dstBeing->calcDirection(dstX, dstY);
 
-            if (dir && dstBeing->getDirection() != dir)
-                dstBeing->setDirectionDelayed(static_cast<Uint8>(dir));
+            if (d && dstBeing->getDirection() != d)
+                dstBeing->setDirectionDelayed(static_cast<Uint8>(d));
         }
 
         if (player_node->getCurrentAction() != Being::STAND)
@@ -584,7 +584,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
     }
     else
     {
-        Uint8 dir;
+//        Uint8 dir;
         Uint16 x, y;
         msg.readCoordinates(x, y, dir);
         dstBeing->setTileCoords(x, y);