diff options
| author | Blue <bluesansdouze@gmail.com> | 2009-05-12 20:46:56 +0200 |
|---|---|---|
| committer | Blue <bluesansdouze@gmail.com> | 2009-05-12 20:46:56 +0200 |
| commit | 9071a692116745f2cafd8556cbff28095910730e (patch) | |
| tree | 6fbc96a1cb00558c4015d1eff25f45b2c6ccdcb8 /src/keyboardconfig.cpp | |
| parent | 2e94f4e92821bad6ebb328d00b2bd918c4b1b99e (diff) | |
| parent | 0257eaf4d3945eac7cb3e50ccf8dfef18fa29698 (diff) | |
| download | mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.gz mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.bz2 mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.xz mana-client-9071a692116745f2cafd8556cbff28095910730e.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/keyboardconfig.cpp')
| -rw-r--r-- | src/keyboardconfig.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index efb8f189..ff05d75b 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -153,10 +153,13 @@ bool KeyboardConfig::hasConflicts() { for (j = i, j++; j < KEY_TOTAL; j++) { - // Allow for item shortcut and emote keys to overlap, but no other keys + // Allow for item shortcut and emote keys to overlap + // as well as emote and ignore keys, but no other keys if (!((((i >= KEY_SHORTCUT_1) && (i <= KEY_SHORTCUT_12)) && ((j >= KEY_EMOTE_1) && (j <= KEY_EMOTE_12))) || - ((i == KEY_TOGGLE_CHAT) && (j == KEY_OK))) && + ((i == KEY_TOGGLE_CHAT) && (j == KEY_OK)) || + ((i == KEY_EMOTE) && + (j == KEY_IGNORE_INPUT_1 || j == KEY_IGNORE_INPUT_2))) && (mKey[i].value == mKey[j].value) ) { |