Client-sided implementation of attacks

2 files changed, 1 insertions, 30 deletions

diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index c2959e1d..c7c77ef4 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -136,14 +136,6 @@ void PopupMenu::handleLink(const std::string& link)
         tradePartnerName = mBeing->getName();
     }
 
-    // Attack action
-    else if (link == "attack" &&
-             mBeing != NULL &&
-             mBeing->getType() == Being::PLAYER)
-    {
-        player_node->attack(mBeing, true);
-    }
-
     /*
     // Follow Player action
     else if (link == "follow")
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index d0525a2f..f26d8d70 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -291,29 +291,9 @@ Viewport::mousePress(int mx, int my, int button)
         Being *being;
         FloorItem *item;
 
-        // Interact with some being
-        if ((being = beingManager->findBeing(tilex, tiley)))
-        {
-            switch (being->getType())
-            {
-                case Being::NPC:
-                    dynamic_cast<NPC*>(being)->talk();
-                    break;
-
-                case Being::MONSTER:
-                case Being::PLAYER:
-                    if (being->mAction == Being::DEAD)
-                        break;
 
-                    player_node->attack(being, true);
-                    break;
-
-                default:
-                    break;
-            }
-        }
         // Pick up some item
-        else if ((item = floorItemManager->findByCoordinates(tilex, tiley)))
+        if ((item = floorItemManager->findByCoordinates(tilex, tiley)))
         {
                 player_node->pickUp(item);
         }
@@ -325,7 +305,6 @@ Viewport::mousePress(int mx, int my, int button)
             if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]))
             {
                 player_node->setDestination(mx + mCameraX, my + mCameraY);
-                player_node->stopAttack();
             }
             mPlayerFollowMouse = true;
         }