diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-02-11 17:02:16 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-02-11 17:02:16 +0100 |
| commit | f262dbd28f08001d70416e3cc4e62273d3fee2cd (patch) | |
| tree | 539cbc8b27edf696120df0ac26531640c323692f /src/keyboardconfig.cpp | |
| parent | d68f3fa13297cf4c8d29753e48c684496852ceba (diff) | |
| parent | 63ac001daa7dfc0735dfefd9c2829c8786b4edaf (diff) | |
| download | mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.gz mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.bz2 mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.xz mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/keyboardconfig.cpp')
| -rw-r--r-- | src/keyboardconfig.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 413a8036..5a0c0678 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -150,11 +150,11 @@ bool KeyboardConfig::hasConflicts() 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)) && - ((j >= KEY_EMOTE_1) && (j <= KEY_EMOTE_12))) || + if (!((((i >= KEY_SHORTCUT_1) && (i <= KEY_SHORTCUT_12)) && + ((j >= KEY_EMOTE_1) && (j <= KEY_EMOTE_12))) || ((i == KEY_TOGGLE_CHAT) && (j == KEY_OK))) && (mKey[i].value == mKey[j].value) - ) + ) { return true; } |