From 07012a81f523b7f6bd095325ddd2675a3ce06d09 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 23 Aug 2014 13:09:30 +0300 Subject: If chat command not found, try find it in input actions. --- src/input/inputmanager.cpp | 23 +++++++++++++++++++++-- src/input/inputmanager.h | 4 ++++ 2 files changed, 25 insertions(+), 2 deletions(-) (limited to 'src/input') diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index 2cbd100e2..c74544432 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -157,8 +157,9 @@ void InputManager::retrieve() } } } - if (!inputActionData[i].chatCommand.empty()) - mChatMap[i] = i; + const std::string &cmd = inputActionData[i].chatCommand; + if (!cmd.empty()) + mChatMap[cmd] = i; } } @@ -728,6 +729,24 @@ void InputManager::executeAction(const int keyNum) func(evt); } +bool InputManager::executeChatCommand(const std::string &cmd, + const std::string &args, + ChatTab *const tab) +{ + const std::map::const_iterator it = mChatMap.find(cmd); + if (it != mChatMap.end()) + { + ActionFuncPtr func = *(inputActionData[(*it).second].action); + if (func) + { + InputEvent evt(args, tab); + func(evt); + return true; + } + } + return false; +} + void InputManager::updateKeyActionMap(KeyToActionMap &actionMap, KeyToIdMap &idMap, KeyTimeMap &keyTimeMap, diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h index 1635bf03c..ab8f3d2f0 100644 --- a/src/input/inputmanager.h +++ b/src/input/inputmanager.h @@ -118,6 +118,10 @@ class InputManager final void executeAction(const int keyNum); + bool executeChatCommand(const std::string &cmd, + const std::string &args, + ChatTab *const tab); + protected: void resetKey(const int i); -- cgit v1.2.3-70-g09d2