diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-10 22:54:14 +0100 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-02-10 20:29:13 -0700 |
| commit | 4f038e895499fcf94fec168ef964f7de4f813113 (patch) | |
| tree | e3f26d895923f4f14bf07f08cb1bac7cd23a32be /src/keyboardconfig.cpp | |
| parent | ff1205d2b89f7f2273a32176c746f36836d7bfa9 (diff) | |
| download | mana-4f038e895499fcf94fec168ef964f7de4f813113.tar.gz mana-4f038e895499fcf94fec168ef964f7de4f813113.tar.bz2 mana-4f038e895499fcf94fec168ef964f7de4f813113.tar.xz mana-4f038e895499fcf94fec168ef964f7de4f813113.zip | |
Whitespace fixes
Mainly removed trailing whitespace. Also small fix in header of
recorder.cpp.
Diffstat (limited to 'src/keyboardconfig.cpp')
| -rw-r--r-- | src/keyboardconfig.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index b75a3c1c..1976e803 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -151,8 +151,8 @@ 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) ) |