From 53ba5a7a61ccb0c3c1bda91fafa372d0966dcc82 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 11 May 2009 06:46:23 -0600 Subject: Allow emote and ignore keys to overlap --- src/keyboardconfig.cpp | 7 +++++-- 1 file 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) ) { -- cgit v1.2.3-70-g09d2