summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-22 20:05:28 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-22 20:05:28 +0300
commit21fb62f9747578a7a81ccfa94369429fba4d4cc1 (patch)
tree3e23f52c8deab87129966f2adc6292092e9fcb87 /src
parentaabe1258a8d7c9640b594069ba04ace8ab0d640f (diff)
downloadmanaplus-21fb62f9747578a7a81ccfa94369429fba4d4cc1.tar.gz
manaplus-21fb62f9747578a7a81ccfa94369429fba4d4cc1.tar.bz2
manaplus-21fb62f9747578a7a81ccfa94369429fba4d4cc1.tar.xz
manaplus-21fb62f9747578a7a81ccfa94369429fba4d4cc1.zip
Remove popup menu action "fire mercenary".
Diffstat (limited to 'src')
-rw-r--r--src/gui/popups/popupmenu.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 06a8edc54..9e394fabb 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -343,7 +343,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
mBrowserBox->addRow("##3---");
// TRANSLATORS: popup menu item
// TRANSLATORS: fire mercenary
- mBrowserBox->addRow("fire mercenary", _("Fire"));
+ mBrowserBox->addRow("/firemercenary", _("Fire"));
mBrowserBox->addRow("##3---");
break;
@@ -1297,10 +1297,6 @@ void PopupMenu::handleLink(const std::string &link,
if (chat != nullptr)
chatHandler->joinChat(chat, "");
}
- else if (link == "fire mercenary")
- {
- mercenaryHandler->fire();
- }
else if (link == "mercenary to master")
{
mercenaryHandler->moveToMaster();