diff options
| author | Angelo Castellani <udp.castellani@gmail.com> | 2011-05-12 01:25:29 -0400 |
|---|---|---|
| committer | Stefan Dombrowski <stefan@uni-bonn.de> | 2011-05-13 11:06:00 +0200 |
| commit | 9641f4c6c24656a73ee759f7c176ba682ae01acf (patch) | |
| tree | 27836da80454d51c35c9b16b8e6191e3827406c7 /src/keyboardconfig.cpp | |
| parent | 1d6311a5ffde800ece8d3085fb5fe7c2c9c50a58 (diff) | |
| download | mana-9641f4c6c24656a73ee759f7c176ba682ae01acf.tar.gz mana-9641f4c6c24656a73ee759f7c176ba682ae01acf.tar.bz2 mana-9641f4c6c24656a73ee759f7c176ba682ae01acf.tar.xz mana-9641f4c6c24656a73ee759f7c176ba682ae01acf.zip | |
Made the setup keyboard tab prettier.
Incidentally I added support for a monospaced font (which may come in handy).
Diffstat (limited to 'src/keyboardconfig.cpp')
| -rw-r--r-- | src/keyboardconfig.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index ec2bf6ed..08ee8896 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -162,7 +162,8 @@ bool KeyboardConfig::hasConflicts() 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)) + if ((i >= KEY_SHORTCUT_1 && i <= KEY_SHORTCUT_12) && + (j >= KEY_EMOTE_1 && j <= KEY_EMOTE_12)) continue; // Why? @@ -181,9 +182,9 @@ bool KeyboardConfig::hasConflicts() if (mKey[i].value == mKey[j].value) { mBindError = strprintf(_("Conflict \"%s\" and \"%s\" keys. " - "Resolve them, or gameplay may result" - " in strange behaviour."), - mKey[i].caption.c_str(), mKey[j].caption.c_str()); + "Resolve them, or gameplay may result" + " in strange behaviour."), + mKey[i].caption.c_str(), mKey[j].caption.c_str()); return true; } } |