summaryrefslogtreecommitdiff
path: root/src/inputmanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/inputmanager.cpp')
-rw-r--r--src/inputmanager.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
index 969867a83..a5994907e 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
@@ -228,13 +228,11 @@ void InputManager::makeDefault(const int i)
bool InputManager::hasConflicts(int &key1, int &key2) const
{
- size_t i;
- size_t j;
/**
* No need to parse the square matrix: only check one triangle
* that's enough to detect conflicts
*/
- for (i = 0; i < Input::KEY_TOTAL; i++)
+ for (int i = 0; i < Input::KEY_TOTAL; i++)
{
if (!*keyData[i].configField)
continue;
@@ -244,6 +242,7 @@ bool InputManager::hasConflicts(int &key1, int &key2) const
if (mKey[i].values[i2].value == Input::KEY_NO_VALUE)
continue;
+ size_t j;
for (j = i, j++; j < Input::KEY_TOTAL; j++)
{