summaryrefslogtreecommitdiff
path: root/src/gui/popups
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-22 20:43:46 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-22 20:43:46 +0300
commitbda7b8cc0776456e8d392be45be9b74183cf0f37 (patch)
treea473856f7744dcd2085e6c237ebde1bac2c23ce7 /src/gui/popups
parent21fb62f9747578a7a81ccfa94369429fba4d4cc1 (diff)
downloadmv-bda7b8cc0776456e8d392be45be9b74183cf0f37.tar.gz
mv-bda7b8cc0776456e8d392be45be9b74183cf0f37.tar.bz2
mv-bda7b8cc0776456e8d392be45be9b74183cf0f37.tar.xz
mv-bda7b8cc0776456e8d392be45be9b74183cf0f37.zip
Add chat command for move mercenary to master.
Diffstat (limited to 'src/gui/popups')
-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 9e394fabb..afc74fdd7 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -338,7 +338,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
case ActorType::Mercenary:
// TRANSLATORS: popup menu item
// TRANSLATORS: Mercenary move to master
- mBrowserBox->addRow("mercenary to master", _("Move to master"));
+ mBrowserBox->addRow("/mercenarytomaster", _("Move to master"));
addGmCommands();
mBrowserBox->addRow("##3---");
// TRANSLATORS: popup menu item
@@ -1297,10 +1297,6 @@ void PopupMenu::handleLink(const std::string &link,
if (chat != nullptr)
chatHandler->joinChat(chat, "");
}
- else if (link == "mercenary to master")
- {
- mercenaryHandler->moveToMaster();
- }
else if (link == "homunculus to master")
{
homunculusHandler->moveToMaster();