diff options
| author | Andrei Karas <akaras@inbox.ru> | 2010-03-08 22:37:44 +0200 |
|---|---|---|
| committer | Chuck Miller <shadowmil@gmail.com> | 2010-03-08 16:18:03 -0500 |
| commit | 1826d95339a371d6246b1453605374260e111e47 (patch) | |
| tree | d547dfcb347ccfac3eaf93784f03be27c1af6640 /src/keyboardconfig.cpp | |
| parent | ae774999ad279b0b4d627c13464bc4818a14a6da (diff) | |
| download | mana-1826d95339a371d6246b1453605374260e111e47.tar.gz mana-1826d95339a371d6246b1453605374260e111e47.tar.bz2 mana-1826d95339a371d6246b1453605374260e111e47.tar.xz mana-1826d95339a371d6246b1453605374260e111e47.zip | |
Add unassign button in setup keyboard tab.
Signed-off-by: Chuck Miller <shadowmil@gmail.com>
Diffstat (limited to 'src/keyboardconfig.cpp')
| -rw-r--r-- | src/keyboardconfig.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 7b462c25..65143d69 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -154,8 +154,14 @@ bool KeyboardConfig::hasConflicts() */ for (i = 0; i < KEY_TOTAL; i++) { + if (mKey[i].value == KEY_NO_VALUE) + continue; + for (j = i, j++; j < KEY_TOTAL; j++) { + if (mKey[j].value == KEY_NO_VALUE) + continue; + // Allow collisions between shortcut and emote keys if ((i >= KEY_SHORTCUT_1 && i <= KEY_SHORTCUT_12) && (j >= KEY_EMOTE_1 && j <= KEY_EMOTE_12)) continue; |