Merge branch 'master' into strippedstripped1.1.9.18

Conflicts:
	src/guichan/cliprectangle.cpp
	src/guichan/focushandler.cpp
	src/guichan/gui.cpp
	src/guichan/include/guichan/cliprectangle.hpp
	src/guichan/include/guichan/inputevent.hpp
	src/guichan/include/guichan/keyevent.hpp
	src/guichan/include/guichan/mouseevent.hpp
	src/guichan/include/guichan/widgets/button.hpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/include/guichan/widgets/radiobutton.hpp
	src/guichan/include/guichan/widgets/slider.hpp
	src/guichan/include/guichan/widgets/tab.hpp
	src/guichan/include/guichan/widgets/tabbedarea.hpp
	src/guichan/include/guichan/widgets/textfield.hpp
	src/guichan/include/guichan/widgets/window.hpp
	src/guichan/inputevent.cpp
	src/guichan/keyevent.cpp
	src/guichan/mouseevent.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/button.cpp
	src/guichan/widgets/checkbox.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/radiobutton.cpp
	src/guichan/widgets/slider.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textfield.cpp
	src/guichan/widgets/window.cpp

6 files changed, 24 insertions, 16 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 ce2db733f..845c30f19 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -27,6 +27,7 @@
 #include "client.h"
 #include "effectmanager.h"
 #include "guild.h"
+#include "guildmanager.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
 #include "logger.h"
@@ -444,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();
@@ -468,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())
@@ -505,10 +506,17 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
 
     guild = msg.readInt32();  // guild
 
-    if (guild == 0)
-        dstBeing->clearGuilds();
-    else
-        dstBeing->setGuild(Guild::getGuild(static_cast<short>(guild)));
+    if (!guildManager || !GuildManager::getEnableGuildBot())
+    {
+        if (guild == 0)
+        {
+            dstBeing->clearGuilds();
+        }
+        else
+        {
+            dstBeing->setGuild(Guild::getGuild(static_cast<short>(guild)));
+        }
+    }
 
     msg.readInt16();  // emblem
     msg.readInt16();  // manner
@@ -560,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)
@@ -576,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);
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index e1b565399..c6ebc000c 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -240,8 +240,8 @@ void GeneralHandler::clearHandlers()
         mNetwork->clearHandlers();
 }
 
-void GeneralHandler::event(Mana::Channels channel,
-                           const Mana::Event &event)
+void GeneralHandler::processEvent(Mana::Channels channel,
+                                  const Mana::Event &event)
 {
     if (channel == Mana::CHANNEL_GAME)
     {
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 27186fcc8..5e6c9f18f 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -59,7 +59,7 @@ class GeneralHandler : public MessageHandler, public Net::GeneralHandler,
 
         void clearHandlers();
 
-        void event(Mana::Channels channel, const Mana::Event &event);
+        void processEvent(Mana::Channels channel, const Mana::Event &event);
 
         void reloadPartially();
 
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 43271671e..f80dd6e69 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -194,7 +194,7 @@ int NpcHandler::getNpc(Net::MessageIn &msg, bool haveLength)
 
     const int npcId = msg.readInt32();
 
-    NpcDialogs::iterator diag = mNpcDialogs.find(npcId);
+    NpcDialogs::const_iterator diag = mNpcDialogs.find(npcId);
     mDialog = 0;
 
     if (diag == mNpcDialogs.end())