diff options
Diffstat (limited to 'src/keyboardconfig.cpp')
| -rw-r--r-- | src/keyboardconfig.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index e351d1cc..32fc0216 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -130,19 +130,19 @@ void KeyboardConfig::makeDefault() bool KeyboardConfig::hasConflicts() { int i, j; -/** - * No need to parse the square matrix: only check one triangle - * that's enough to detect conflicts - */ + /** + * No need to parse the square matrix: only check one triangle + * that's enough to detect conflicts + */ for (i = 0; i < KEY_TOTAL; i++) { for (j = i, j++; j < KEY_TOTAL; j++) { // Allow for item shortcut and emote keys to overlap, but no other keys - if (!(((i >= KEY_SHORTCUT_1) && (i <= KEY_SHORTCUT_12)) && + if (!(((i >= KEY_SHORTCUT_1) && (i <= KEY_SHORTCUT_12)) && ((j >= KEY_EMOTE_1) && (j <= KEY_EMOTE_12))) && mKey[i].value == mKey[j].value - ) + ) { return true; } @@ -160,7 +160,7 @@ int KeyboardConfig::getKeyIndex(int keyValue) const { for (int i = 0; i < KEY_TOTAL; i++) { - if(keyValue == mKey[i].value) + if (keyValue == mKey[i].value) { return i; } @@ -173,7 +173,7 @@ int KeyboardConfig::getKeyEmoteOffset(int keyValue) const { for (int i = KEY_EMOTE_1; i <= KEY_EMOTE_12; i++) { - if(keyValue == mKey[i].value) + if (keyValue == mKey[i].value) { return 1 + i - KEY_EMOTE_1; } |