summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-12 12:29:01 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-12 12:29:01 +0300
commiteda8a2e6bd872af5a4e53f7b517ce2a57e5db246 (patch)
treee089a5c7052218f2d8c001df251481d656db2a4a
parent38d5199a67d59d1ba8fc02a3771a9567d66efd7d (diff)
downloadmv-eda8a2e6bd872af5a4e53f7b517ce2a57e5db246.tar.gz
mv-eda8a2e6bd872af5a4e53f7b517ce2a57e5db246.tar.bz2
mv-eda8a2e6bd872af5a4e53f7b517ce2a57e5db246.tar.xz
mv-eda8a2e6bd872af5a4e53f7b517ce2a57e5db246.zip
Remove "nuke" popup menu handler.
-rw-r--r--src/gui/popups/popupmenu.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index ea0d9f617..9fed214d9 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -237,7 +237,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
// TRANSLATORS: popup menu item
// TRANSLATORS: set player invisible for self by id
- mBrowserBox->addRow("nuke", _("Nuke"));
+ mBrowserBox->addRow("/nuke 'NAME'", _("Nuke"));
// TRANSLATORS: popup menu item
// TRANSLATORS: move to player location
mBrowserBox->addRow("move", _("Move"));
@@ -981,17 +981,8 @@ void PopupMenu::handleLink(const std::string &link,
if (actorManager)
being = actorManager->findBeing(mBeingId);
- if (link == "nuke" && being)
- {
- if (actorManager)
- {
- actorManager->addBlock(static_cast<uint32_t>(
- being->getId()));
- actorManager->destroy(being);
- }
- }
// Follow Player action
- else if (link == "follow" && !mNick.empty())
+ if (link == "follow" && !mNick.empty())
{
if (localPlayer)
localPlayer->setFollow(mNick);