summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-22 21:37:28 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-22 21:37:28 +0300
commit0f6dad4c14f1f87797f903d8b4c4b87dcbc6a907 (patch)
tree85d715bb565d5cdbcc3926567d9d3141823f5ecb /src
parent70f7db29f291ea22e6dca7c03540beded7ec7bf8 (diff)
downloadmv-0f6dad4c14f1f87797f903d8b4c4b87dcbc6a907.tar.gz
mv-0f6dad4c14f1f87797f903d8b4c4b87dcbc6a907.tar.bz2
mv-0f6dad4c14f1f87797f903d8b4c4b87dcbc6a907.tar.xz
mv-0f6dad4c14f1f87797f903d8b4c4b87dcbc6a907.zip
Remove popup menu action "homunculus delete".
Diffstat (limited to 'src')
-rw-r--r--src/gui/popups/popupmenu.cpp6
-rw-r--r--src/input/inputactionmap.h2
2 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index b13a2c374..1281a8d2c 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -366,7 +366,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
mBrowserBox->addRow("##3---");
// TRANSLATORS: popup menu item
// TRANSLATORS: delete homunculus
- mBrowserBox->addRow("homunculus delete", _("Kill"));
+ mBrowserBox->addRow("/homunculusfire", _("Kill"));
mBrowserBox->addRow("##3---");
}
addGmCommands();
@@ -1297,10 +1297,6 @@ void PopupMenu::handleLink(const std::string &link,
if (chat != nullptr)
chatHandler->joinChat(chat, "");
}
- else if (link == "homunculus delete")
- {
- homunculusHandler->fire();
- }
else if (link == "craftmenu")
{
showCraftPopup();
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 95a3b8d3e..881368195 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -4156,7 +4156,7 @@ static const InputActionData inputActionData
{"keyHomunculusFire",
defaultAction(&Actions::fireHomunculus),
InputCondition::INGAME,
- "firehomunculus|homunculusfire",
+ "firehomunculus|homunculusfire|firehomun|homunfire",
UseArgs_false,
Protected_true},
{"keyWindowBank",