summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-16 02:24:15 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-16 02:24:15 +0300
commit087a2f8802bb91ca06d4d82af4a132dd9a70267e (patch)
tree30e45a169f28127b123f369e6f2aad3ed56d34d8
parentb1876f6c72222dae051bd964dab89f24a66d96c0 (diff)
downloadmv-087a2f8802bb91ca06d4d82af4a132dd9a70267e.tar.gz
mv-087a2f8802bb91ca06d4d82af4a132dd9a70267e.tar.bz2
mv-087a2f8802bb91ca06d4d82af4a132dd9a70267e.tar.xz
mv-087a2f8802bb91ca06d4d82af4a132dd9a70267e.zip
Trigger asserts if unknown commands executed in popup menu or in chat.
-rw-r--r--src/gui/popups/popupmenu.cpp3
-rw-r--r--src/input/inputmanager.cpp7
2 files changed, 9 insertions, 1 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 8257033b4..fc3a52a77 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -92,6 +92,7 @@
#include "resources/skill/skillinfo.h"
#include "utils/copynpaste.h"
+#include "utils/checkutils.h"
#include "utils/gettext.h"
#include "utils/process.h"
@@ -1690,7 +1691,7 @@ void PopupMenu::handleLink(const std::string &link,
// Unknown actions
else if (link != "cancel")
{
- logger->log("PopupMenu: Warning, unknown action '%s'", link.c_str());
+ reportAlways("PopupMenu: Warning, unknown action '%s'", link.c_str());
}
if (!mAllowCleanMenu)
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index 9133be6ac..bf4433339 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -53,6 +53,7 @@
#include "gui/windows/textdialog.h"
#include "gui/windows/tradewindow.h"
+#include "utils/checkutils.h"
#include "utils/gettext.h"
#include "utils/timer.h"
@@ -848,6 +849,12 @@ bool InputManager::executeChatCommand(const std::string &restrict cmd,
return true;
}
}
+ else
+ {
+ reportAlways("Unknown chat command: /%s %s",
+ cmd.c_str(),
+ args.c_str());
+ }
return false;
}