Continue fix for shadow variables/methods errors.

7 files changed, 33 insertions, 33 deletions

diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 685562d6f..f38d17a59 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -70,7 +70,7 @@ void BuySellHandler::requestSellList(std::string nick)
     else
     {
         if (chatWindow)
-            chatWindow->whisper(nick, data, BY_PLAYER);
+            chatWindow->addWhisper(nick, data, BY_PLAYER);
     }
 }
 
@@ -89,7 +89,7 @@ void BuySellHandler::requestBuyList(std::string nick)
     else
     {
         if (chatWindow)
-            chatWindow->whisper(nick, data, BY_PLAYER);
+            chatWindow->addWhisper(nick, data, BY_PLAYER);
     }
 }
 
@@ -102,12 +102,12 @@ void BuySellHandler::sendBuyRequest(std::string nick, ShopItem* item,
         return;
     }
     std::string data = strprintf("!buyitem %d %d %d",
-                        item->getId(), item->getPrice(), amount);
+        item->getId(), item->getPrice(), amount);
 
     if (config.getBoolValue("hideShopMessages"))
         Net::getChatHandler()->privateMessage(nick, data);
     else
-        chatWindow->whisper(nick, data, BY_PLAYER);
+        chatWindow->addWhisper(nick, data, BY_PLAYER);
 }
 
 void BuySellHandler::sendSellRequest(std::string nick, ShopItem* item,
@@ -120,12 +120,12 @@ void BuySellHandler::sendSellRequest(std::string nick, ShopItem* item,
     }
 
     std::string data = strprintf("!sellitem %d %d %d",
-                       item->getId(), item->getPrice(), amount);
+        item->getId(), item->getPrice(), amount);
 
     if (config.getBoolValue("hideShopMessages"))
         Net::getChatHandler()->privateMessage(nick, data);
     else
-        chatWindow->whisper(nick, data, BY_PLAYER);
+        chatWindow->addWhisper(nick, data, BY_PLAYER);
 }
 
 void BuySellHandler::processNpcBuySellChoice(Net::MessageIn &msg)
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 5737cc2b2..c18b1bb9a 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -125,7 +125,7 @@ void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
         case 0x01:
             if (chatWindow)
             {
-                chatWindow->whisper(nick,
+                chatWindow->addWhisper(nick,
                     strprintf(_("Whisper could not be "
                     "sent, %s is offline."), nick.c_str()), BY_SERVER);
             }
@@ -133,7 +133,7 @@ void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
         case 0x02:
             if (chatWindow)
             {
-                chatWindow->whisper(nick,
+                chatWindow->addWhisper(nick,
                     strprintf(_("Whisper could not "
                     "be sent, ignored by %s."), nick.c_str()),
                     BY_SERVER);
@@ -183,7 +183,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
                         if (tradeBot)
                         {
                             if (showMsg && chatWindow)
-                                chatWindow->whisper(nick, chatMsg);
+                                chatWindow->addWhisper(nick, chatMsg);
                             shopWindow->giveList(nick,
                                 ShopWindow::SELL);
                         }
@@ -193,7 +193,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
                         if (tradeBot)
                         {
                             if (showMsg && chatWindow)
-                                chatWindow->whisper(nick, chatMsg);
+                                chatWindow->addWhisper(nick, chatMsg);
                             shopWindow->giveList(nick,
                                 ShopWindow::BUY);
                         }
@@ -201,7 +201,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
                     else if (chatMsg.find("!buyitem ") == 0)
                     {
                         if (showMsg && chatWindow)
-                            chatWindow->whisper(nick, chatMsg);
+                            chatWindow->addWhisper(nick, chatMsg);
                         if (tradeBot)
                         {
                             shopWindow->processRequest(nick, chatMsg,
@@ -211,7 +211,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
                     else if (chatMsg.find("!sellitem ") == 0)
                     {
                         if (showMsg && chatWindow)
-                            chatWindow->whisper(nick, chatMsg);
+                            chatWindow->addWhisper(nick, chatMsg);
                         if (tradeBot)
                         {
                             shopWindow->processRequest(nick, chatMsg,
@@ -223,7 +223,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
                     {
                         chatMsg = chatMsg.erase(0, 2);
                         if (showMsg && chatWindow)
-                            chatWindow->whisper(nick, chatMsg);
+                            chatWindow->addWhisper(nick, chatMsg);
                         if (chatMsg.find("B1") == 0
                             || chatMsg.find("S1") == 0)
                         {
@@ -232,12 +232,12 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
                     }
                     else if (chatWindow)
                     {
-                        chatWindow->whisper(nick, chatMsg);
+                        chatWindow->addWhisper(nick, chatMsg);
                     }
                 }
                 else if (chatWindow)
                 {
-                    chatWindow->whisper(nick, chatMsg);
+                    chatWindow->addWhisper(nick, chatMsg);
                 }
             }
             else
@@ -246,7 +246,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
                     || (chatMsg.find("!selllist")
                     != 0 && chatMsg.find("!buylist") != 0)))
                 {
-                    chatWindow->whisper(nick, chatMsg);
+                    chatWindow->addWhisper(nick, chatMsg);
                 }
             }
         }
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 4be4ddaa6..cb1e84673 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -114,15 +114,15 @@ class InventoryItem
         int refine;
         bool equip;
 
-        InventoryItem(int slot, int id, int quantity, int refine,
-                      unsigned char color, bool equip)
+        InventoryItem(int slot0, int id0, int quantity0, int refine0,
+                      unsigned char color0, bool equip0)
         {
-            this->slot = slot;
-            this->id = id;
-            this->quantity = quantity;
-            this->refine = refine;
-            this->color = color;
-            this->equip = equip;
+            slot = slot0;
+            id = id0;
+            quantity = quantity0;
+            refine = refine0;
+            color = color0;
+            equip = equip0;
         }
 };
 
diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index 85323b11a..16552018e 100644
--- a/src/net/manaserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -231,7 +231,7 @@ void ChatHandler::handlePrivateMessage(Net::MessageIn &msg)
     std::string userNick = msg.readString();
     std::string chatMsg = msg.readString();
 
-    chatWindow->whisper(userNick, chatMsg);
+    chatWindow->addWhisper(userNick, chatMsg);
 }
 
 void ChatHandler::handleAnnouncement(Net::MessageIn &msg)
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);