summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-04 22:32:59 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-04 22:32:59 +0300
commit268afc3546a89cc712cd50b3a62625a2462a7bbb (patch)
tree019b378ae3b8a7c84bbabb5b28f34c2f5c7a3e0a
parentf9e3caa345ddff77ede9b9a5e55e31209e1cc55d (diff)
downloadmanaplus-268afc3546a89cc712cd50b3a62625a2462a7bbb.tar.gz
manaplus-268afc3546a89cc712cd50b3a62625a2462a7bbb.tar.bz2
manaplus-268afc3546a89cc712cd50b3a62625a2462a7bbb.tar.xz
manaplus-268afc3546a89cc712cd50b3a62625a2462a7bbb.zip
Fix nuke command and menu action. Rename gm nuke command into /gmnuke.
-rw-r--r--src/gui/popups/popupmenu.cpp2
-rw-r--r--src/input/inputactionmap.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 620d9c050..fe636bf61 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -2903,7 +2903,7 @@ void PopupMenu::showPlayerGMCommands(const std::string &name)
// TRANSLATORS: popup menu item
// TRANSLATORS: nuke player
- mBrowserBox->addRow("/nuke 'NAME'", _("Nuke"));
+ mBrowserBox->addRow("/gmnuke 'NAME'", _("Nuke"));
// TRANSLATORS: popup menu item
// TRANSLATORS: kill player
mBrowserBox->addRow("/kill 'NAME'", _("Kill"));
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index d3a5257f4..4f677efda 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -5428,7 +5428,7 @@ static const InputActionData inputActionData
{"keyCommandNuke",
defaultAction(&Actions::commandNuke),
InputCondition::INGAME,
- "nuke",
+ "gmnuke",
UseArgs_true,
Protected_true},
{"keyCommandKill",