diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-02-18 15:50:43 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-02-18 15:55:22 +0300 |
commit | 571d6151f0983e488feafb3cd6c9c74bbd038082 (patch) | |
tree | c5f410e872d0a33b7efa8157fff3b92346192a0a /src/input/inputmanager.cpp | |
parent | 02cc3470578d1c950cbd7731f86e24167d04a9df (diff) | |
download | manaplus-571d6151f0983e488feafb3cd6c9c74bbd038082.tar.gz manaplus-571d6151f0983e488feafb3cd6c9c74bbd038082.tar.bz2 manaplus-571d6151f0983e488feafb3cd6c9c74bbd038082.tar.xz manaplus-571d6151f0983e488feafb3cd6c9c74bbd038082.zip |
Add some extra checks and logging while sorting keys.
Diffstat (limited to 'src/input/inputmanager.cpp')
-rw-r--r-- | src/input/inputmanager.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index 4f9c1ce6b..eb6627d2a 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -921,8 +921,27 @@ void InputManager::updateKeyActionMap(KeyToActionMap &restrict actionMap, FOR_EACH (KeyToActionMapIter, it, actionMap) { KeysVector *const keys = &it->second; - if (keys && keys->size() > 1) + if (!keys) + continue; + const size_t sz = keys->size(); + if (sz > 1) + { + logger->log("keys size: %d", CAST_S32(sz)); + int sum = 0; + FOR_EACHP (KeysVectorIter, itk, keys) + { + const size_t val = CAST_SIZE(*itk); + if (val >= CAST_SIZE(InputAction::TOTAL)) + { + logger->log("wrong action index: %ld", + static_cast<long>(val)); + break; + } + sum += inputActionData[val].priority; + } + logger->log("sum: %d", sum); std::sort(keys->begin(), keys->end(), inputActionDataSorter); + } } } |