summaryrefslogtreecommitdiff
path: root/src/gui/popups/popupmenu.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-01-27 18:55:52 +0300
committerAndrei Karas <akaras@inbox.ru>2016-01-27 18:55:52 +0300
commiteb0c8a2a08a7b55eb80667b106657aeee4023dd9 (patch)
tree72aacba357f61d997baec2819195595772a5da70 /src/gui/popups/popupmenu.cpp
parentdd73b250eb8390a87e09eeefc054202835b29a43 (diff)
downloadmanaverse-eb0c8a2a08a7b55eb80667b106657aeee4023dd9.tar.gz
manaverse-eb0c8a2a08a7b55eb80667b106657aeee4023dd9.tar.bz2
manaverse-eb0c8a2a08a7b55eb80667b106657aeee4023dd9.tar.xz
manaverse-eb0c8a2a08a7b55eb80667b106657aeee4023dd9.zip
remove removepickup action from social window popup menu.
Diffstat (limited to 'src/gui/popups/popupmenu.cpp')
-rw-r--r--src/gui/popups/popupmenu.cpp27
1 files changed, 1 insertions, 26 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index e792b2bb4..d2e4a100d 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1289,31 +1289,6 @@ void PopupMenu::handleLink(const std::string &link,
socialWindow->updateAttackFilter();
}
}
- else if (link == "pickup remove")
- {
- if (actorManager)
- {
- if (mNick.empty())
- {
- if (actorManager->isInPickupList(mNick))
- {
- actorManager->removePickupItem(mNick);
- actorManager->addIgnorePickupItem(mNick);
- }
- else
- {
- actorManager->removePickupItem(mNick);
- actorManager->addPickupItem(mNick);
- }
- }
- else
- {
- actorManager->removePickupItem(mNick);
- }
- if (socialWindow)
- socialWindow->updatePickupFilter();
- }
- }
else if (link == "reset yellow")
{
GameModifiers::resetModifiers();
@@ -2129,7 +2104,7 @@ void PopupMenu::showPickupItemPopup(const int x, const int y,
// TRANSLATORS: popup menu item
// TRANSLATORS: remove item from pickup filter
- mBrowserBox->addRow("pickup remove", _("Remove"));
+ mBrowserBox->addRow("/removepickup 'NAME'", _("Remove"));
mBrowserBox->addRow("##3---");
// TRANSLATORS: popup menu item
// TRANSLATORS: close menu