1 files changed, 42 insertions, 33 deletions

diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 409a0eda..8ff638c2 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -21,14 +21,14 @@
 
 #include "gui/popupmenu.h"
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
 #include "flooritem.h"
 #include "graphics.h"
 #include "item.h"
 #include "localplayer.h"
 #include "log.h"
-#include "npc.h"
+#include "playerinfo.h"
 #include "playerrelations.h"
 
 #include "gui/chat.h"
@@ -76,7 +76,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 
     switch (being->getType())
     {
-        case Being::PLAYER:
+        case ActorSprite::PLAYER:
             {
                 // Players can be traded with.
                 mBrowserBox->addRow(strprintf("@@trade|%s@@",
@@ -143,7 +143,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
             }
             break;
 
-        case Being::NPC:
+        case ActorSprite::NPC:
             // NPCs can be talked to (single option, candidate for removal
             // unless more options would be added)
             mBrowserBox->addRow(strprintf("@@talk|%s@@",
@@ -151,7 +151,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
                                                     name.c_str()).c_str()));
             break;
 
-        case Being::MONSTER:
+        case ActorSprite::MONSTER:
             {
                 // Monsters can be attacked
                 mBrowserBox->addRow(strprintf("@@attack|%s@@",
@@ -180,11 +180,11 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 void PopupMenu::showPopup(int x, int y, FloorItem *floorItem)
 {
     mFloorItem = floorItem;
-    mItem = floorItem->getItem();
+    ItemInfo info = floorItem->getInfo();
     mBrowserBox->clearRows();
 
     // Floor item can be picked up (single option, candidate for removal)
-    std::string name = ItemDB::get(mFloorItem->getItemId()).getName();
+    std::string name = info.getName();
     mBrowserBox->addRow(strprintf("@@pickup|%s@@", strprintf(_("Pick up %s"),
                                                     name.c_str()).c_str()));
     mBrowserBox->addRow(strprintf("@@chat|%s@@", _("Add to chat")));
@@ -198,16 +198,17 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem)
 
 void PopupMenu::handleLink(const std::string &link)
 {
-    Being *being = beingManager->findBeing(mBeingId);
+    Being *being = actorSpriteManager->findBeing(mBeingId);
 
     // Talk To action
-    if (link == "talk" && being && being->getType() == Being::NPC)
+    if (link == "talk" && being && being->canTalk())
     {
-        static_cast<NPC*>(being)->talk();
+        being->talkTo();
     }
 
     // Trade action
-    else if (link == "trade" && being && being->getType() == Being::PLAYER)
+    else if (link == "trade" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
         Net::getTradeHandler()->request(being);
         tradePartnerName = being->getName();
@@ -221,27 +222,32 @@ void PopupMenu::handleLink(const std::string &link)
     {
         chatWindow->addInputText("/w \"" + being->getName() + "\" ");
     }
-    else if (link == "unignore" && being && being->getType() == Being::PLAYER)
+    else if (link == "unignore" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::NEUTRAL);
     }
 
-    else if (link == "ignore" && being && being->getType() == Being::PLAYER)
+    else if (link == "ignore" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::IGNORED);
     }
 
-    else if (link == "disregard" && being && being->getType() == Being::PLAYER)
+    else if (link == "disregard" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::DISREGARDED);
     }
 
-    else if (link == "friend" && being && being->getType() == Being::PLAYER)
+    else if (link == "friend" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::FRIEND);
     }
     // Guild action
-    else if (link == "guild" && being && being->getType() == Being::PLAYER)
+    else if (link == "guild" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
         player_node->inviteToGuild(being);
     }
@@ -257,25 +263,27 @@ void PopupMenu::handleLink(const std::string &link)
     {
     }
 
-    else if (link == "use")
+    else if (link == "activate")
     {
         assert(mItem);
-        if (mItem->isEquipment())
+        if (mItem->isEquippable())
         {
             if (mItem->isEquipped())
-                Net::getInventoryHandler()->unequipItem(mItem);
+                mItem->doEvent(EVENT_DOUNEQUIP);
             else
-                Net::getInventoryHandler()->equipItem(mItem);
+                mItem->doEvent(EVENT_DOEQUIP);
         }
         else
         {
-            Net::getInventoryHandler()->useItem(mItem);
+            mItem->doEvent(EVENT_DOUSE);
         }
     }
-
     else if (link == "chat")
     {
-        chatWindow->addItemText(mItem->getInfo().getName());
+        if (mItem)
+            chatWindow->addItemText(mItem->getInfo().getName());
+        else if (mFloorItem)
+            chatWindow->addItemText(mFloorItem->getInfo().getName());
     }
 
     else if (link == "split")
@@ -302,9 +310,10 @@ void PopupMenu::handleLink(const std::string &link)
                                      mItem);
     }
 
-    else if (link == "party" && being && being->getType() == Being::PLAYER)
+    else if (link == "party" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
-        Net::getPartyHandler()->invite(static_cast<Player*>(being));
+        Net::getPartyHandler()->invite(being);
     }
 
     else if (link == "name" && being)
@@ -315,8 +324,8 @@ void PopupMenu::handleLink(const std::string &link)
 
     else if (link == "admin-kick" &&
              being &&
-             (being->getType() == Being::PLAYER ||
-              being->getType() == Being::MONSTER))
+             (being->getType() == ActorSprite::PLAYER ||
+              being->getType() == ActorSprite::MONSTER))
     {
         Net::getAdminHandler()->kick(being->getId());
     }
@@ -344,15 +353,15 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item,
 
     if (isInventory)
     {
-        if (item->isEquipment())
+        if (item->getInfo().getEquippable())
         {
             if (item->isEquipped())
-                mBrowserBox->addRow(strprintf("@@use|%s@@", _("Unequip")));
+                mBrowserBox->addRow(strprintf("@@equip|%s@@", _("Unequip")));
             else
-                mBrowserBox->addRow(strprintf("@@use|%s@@", _("Equip")));
+                mBrowserBox->addRow(strprintf("@@equip|%s@@", _("Equip")));
         }
-        else
-            mBrowserBox->addRow(strprintf("@@use|%s@@", _("Use")));
+        if (item->getInfo().getActivatable())
+            mBrowserBox->addRow(strprintf("@@activate|%s@@", _("Activate")));
 
         if (item->getQuantity() > 1)
             mBrowserBox->addRow(strprintf("@@drop|%s@@", _("Drop...")));
@@ -364,7 +373,7 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item,
             mBrowserBox->addRow(strprintf("@@split|%s@@", _("Split")));
         }
 
-        if (InventoryWindow::isStorageActive())
+        if (PlayerInfo::getStorageCount() > 0)
         {
             mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store")));
         }