Merge branch 'master' of git@gitorious.org:tmw/mainline

4 files changed, 7 insertions, 7 deletions

diff --git a/src/net/tmwserv/beinghandler.cpp b/src/net/tmwserv/beinghandler.cpp
index 1a1744cc..08847d7d 100644
--- a/src/net/tmwserv/beinghandler.cpp
+++ b/src/net/tmwserv/beinghandler.cpp
@@ -139,7 +139,7 @@ void BeingHandler::handleBeingEnterMessage(MessageIn &msg)
             }
             else
             {
-                being = beingManager->createBeing(id, type, 0);
+                being = beingManager->createBeing(id, Being::PLAYER, 0);
                 being->setName(name);
             }
             Player *p = static_cast< Player * >(being);
@@ -154,7 +154,8 @@ void BeingHandler::handleBeingEnterMessage(MessageIn &msg)
         case OBJECT_NPC:
         {
             int subtype = msg.readInt16();
-            being = beingManager->createBeing(id, type, subtype);
+            being = beingManager->createBeing(id, type == OBJECT_MONSTER ?
+                                    Being::MONSTER : Being::NPC, subtype);
             std::string name = msg.readString();
             if (name.length() > 0) being->setName(name);
         } break;
diff --git a/src/net/tmwserv/partyhandler.cpp b/src/net/tmwserv/partyhandler.cpp
index dfbcea80..510eb77a 100644
--- a/src/net/tmwserv/partyhandler.cpp
+++ b/src/net/tmwserv/partyhandler.cpp
@@ -26,9 +26,10 @@
 
 #include "net/messagein.h"
 
-#include "gui/chat.h"
 #include "gui/partywindow.h"
 
+#include "gui/widgets/chattab.h"
+
 #include "log.h"
 #include "localplayer.h"
 
diff --git a/src/net/tmwserv/playerhandler.cpp b/src/net/tmwserv/playerhandler.cpp
index f02ed4c1..106894a1 100644
--- a/src/net/tmwserv/playerhandler.cpp
+++ b/src/net/tmwserv/playerhandler.cpp
@@ -85,9 +85,6 @@ namespace {
             npcTextDialog->setVisible(false);
             buyDialog->setVisible(false);
             sellDialog->setVisible(false);
-#ifdef EATHENA_SUPPORT
-            buySellDialog->setVisible(false);
-#endif
             current_npc = 0;
         }
     } deathListener;
diff --git a/src/net/tmwserv/tradehandler.cpp b/src/net/tmwserv/tradehandler.cpp
index 85228355..8b3e06c6 100644
--- a/src/net/tmwserv/tradehandler.cpp
+++ b/src/net/tmwserv/tradehandler.cpp
@@ -30,10 +30,11 @@
 #include "item.h"
 #include "localplayer.h"
 
-#include "gui/chat.h"
 #include "gui/confirm_dialog.h"
 #include "gui/trade.h"
 
+#include "gui/widgets/chattab.h"
+
 std::string tradePartnerName;
 int tradePartnerID;