summaryrefslogtreecommitdiff
path: root/src/gui/popups
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-12 13:22:09 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-12 13:22:09 +0300
commit99b516c9b20e696ddf3897bff9bc6686debf0f5a (patch)
tree4fb1b322d7bdb000368b7a88aca5077a23dd840a /src/gui/popups
parentf9313f7f26efa7dbf9d5bc8036833c94b04ea08c (diff)
downloadmv-99b516c9b20e696ddf3897bff9bc6686debf0f5a.tar.gz
mv-99b516c9b20e696ddf3897bff9bc6686debf0f5a.tar.bz2
mv-99b516c9b20e696ddf3897bff9bc6686debf0f5a.tar.xz
mv-99b516c9b20e696ddf3897bff9bc6686debf0f5a.zip
Remove "pickup" popup menu handler.
Diffstat (limited to 'src/gui/popups')
-rw-r--r--src/gui/popups/popupmenu.cpp17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index fabf42eb7..9162a1573 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -564,7 +564,7 @@ void PopupMenu::showPopup(const int x, const int y,
{
// TRANSLATORS: popup menu item
// TRANSLATORS: pickup item from ground
- mBrowserBox->addRow("pickup", _("Pick up"));
+ mBrowserBox->addRow("/pickup 'FLOORID'", _("Pick up"));
mBrowserBox->addRow("##3---");
}
addPickupFilter(name);
@@ -573,7 +573,7 @@ void PopupMenu::showPopup(const int x, const int y,
{
// TRANSLATORS: popup menu item
// TRANSLATORS: pickup item from ground
- mBrowserBox->addRow("pickup", _("Pick up"));
+ mBrowserBox->addRow("/pickup 'FLOORID'", _("Pick up"));
}
addProtection();
// TRANSLATORS: popup menu item
@@ -981,18 +981,7 @@ void PopupMenu::handleLink(const std::string &link,
if (actorManager)
being = actorManager->findBeing(mBeingId);
- // Pick Up Floor Item action
- if ((link == "pickup") && mFloorItemId)
- {
- if (localPlayer && actorManager)
- {
- FloorItem *const item = actorManager->findItem(
- mFloorItemId);
- if (item)
- localPlayer->pickUp(item);
- }
- }
- else if (link == "use" && mItemId)
+ if (link == "use" && mItemId)
{
if (mItemId < SPELL_MIN_ID)
{