diff options
Diffstat (limited to 'src/keyboardconfig.cpp')
| -rw-r--r-- | src/keyboardconfig.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 65143d69..61e7571a 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -20,7 +20,6 @@ #include "configuration.h" #include "keyboardconfig.h" -#include "log.h" #include "gui/sdlinput.h" #include "gui/setup_keyboard.h" @@ -54,7 +53,6 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = { {"keyBeingSit", SDLK_s, _("Sit")}, {"keyScreenshot", SDLK_p, _("Screenshot")}, {"keyTrade", SDLK_r, _("Enable/Disable Trading")}, - {"keyPathfind", SDLK_f, _("Find Path to Mouse")}, {"keyShortcut1", SDLK_1, strprintf(_("Item Shortcut %d"), 1)}, {"keyShortcut2", SDLK_2, strprintf(_("Item Shortcut %d"), 2)}, {"keyShortcut3", SDLK_3, strprintf(_("Item Shortcut %d"), 3)}, @@ -163,7 +161,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? @@ -182,9 +181,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; } } |