Merge branch 'eathena/master'

Conflicts:
	A lot of files.

4 files changed, 5 insertions, 3 deletions

diff --git a/src/net/tmwserv/beinghandler.cpp b/src/net/tmwserv/beinghandler.cpp
index ac33b6fe..947d6b80 100644
--- a/src/net/tmwserv/beinghandler.cpp
+++ b/src/net/tmwserv/beinghandler.cpp
@@ -289,7 +289,7 @@ void BeingHandler::handleBeingsDamageMessage(MessageIn &msg)
         int damage = msg.readInt16();
         if (being)
         {
-            being->takeDamage(damage);
+            being->takeDamage(0, damage, Being::HIT);
         }
     }
 }
diff --git a/src/net/tmwserv/buysellhandler.cpp b/src/net/tmwserv/buysellhandler.cpp
index 54750cbb..6e4b9d56 100644
--- a/src/net/tmwserv/buysellhandler.cpp
+++ b/src/net/tmwserv/buysellhandler.cpp
@@ -57,7 +57,7 @@ void BuySellHandler::handleMessage(MessageIn &msg)
         return;
     }
 
-    current_npc = static_cast< NPC * >(being);
+    current_npc = being->getId();
 
     switch (msg.getId())
     {
diff --git a/src/net/tmwserv/npchandler.cpp b/src/net/tmwserv/npchandler.cpp
index 53f3c7b2..b3e36749 100644
--- a/src/net/tmwserv/npchandler.cpp
+++ b/src/net/tmwserv/npchandler.cpp
@@ -55,7 +55,7 @@ void NPCHandler::handleMessage(MessageIn &msg)
         return;
     }
 
-    current_npc = static_cast< NPC * >(being);
+    current_npc = being->getId();
 
     switch (msg.getId())
     {
diff --git a/src/net/tmwserv/playerhandler.cpp b/src/net/tmwserv/playerhandler.cpp
index d4850f43..f4cc4b23 100644
--- a/src/net/tmwserv/playerhandler.cpp
+++ b/src/net/tmwserv/playerhandler.cpp
@@ -84,7 +84,9 @@ namespace {
             npcTextDialog->setVisible(false);
             buyDialog->setVisible(false);
             sellDialog->setVisible(false);
+#ifdef EATHENA_SUPPORT
             buySellDialog->setVisible(false);
+#endif
             current_npc = 0;
         }
     } deathListener;