diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-06 00:23:38 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-06 00:23:38 +0300 |
| commit | 1e7f9bf8dbb641fc3aae6f72ac421dc8a7a48ce3 (patch) | |
| tree | dd86a1947dab5742b33173c377763ad4e9cd24b3 /src | |
| parent | 237cbc536ce74a0d4f1540b299e29f81e903b3ae (diff) | |
| download | manaplus-1e7f9bf8dbb641fc3aae6f72ac421dc8a7a48ce3.tar.gz manaplus-1e7f9bf8dbb641fc3aae6f72ac421dc8a7a48ce3.tar.bz2 manaplus-1e7f9bf8dbb641fc3aae6f72ac421dc8a7a48ce3.tar.xz manaplus-1e7f9bf8dbb641fc3aae6f72ac421dc8a7a48ce3.zip | |
FIx code style in keyboarddata.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboarddata.h | 64 |
1 files changed, 48 insertions, 16 deletions
diff --git a/src/keyboarddata.h b/src/keyboarddata.h index 825da9e57..8fcb24ecf 100644 --- a/src/keyboarddata.h +++ b/src/keyboarddata.h @@ -45,6 +45,12 @@ struct KeyData int condition; }; +struct SetupActionData +{ + int actionId; + int defaultValue; +}; + // keyData must be in same order as enum keyAction. static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = { @@ -786,19 +792,29 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = { nullptr, KeyboardConfig::KEY_NO_VALUE, 50, COND_DEFAULT}, - {"keyWearOutfit", SDLK_RCTRL, N_("Wear Outfit"), - KeyboardConfig::GRP_DEFAULT, nullptr, - KeyboardConfig::KEY_NO_VALUE, 50, COND_DEFAULT}, - {"keyCopyOutfit", SDLK_RALT, N_("Copy Outfit"), - KeyboardConfig::GRP_DEFAULT, nullptr, - KeyboardConfig::KEY_NO_VALUE, 50, COND_DEFAULT}, + {"keyWearOutfit", SDLK_RCTRL, + N_("Wear Outfit"), + KeyboardConfig::GRP_DEFAULT, + nullptr, + KeyboardConfig::KEY_NO_VALUE, 50, + COND_DEFAULT}, + {"keyCopyOutfit", SDLK_RALT, + N_("Copy Outfit"), + KeyboardConfig::GRP_DEFAULT, + nullptr, + KeyboardConfig::KEY_NO_VALUE, 50, + COND_DEFAULT}, {"keyCopyEquipedOutfit", SDLK_RIGHTBRACKET, N_("Copy equipped to Outfit"), KeyboardConfig::GRP_DEFAULT, &ActionManager::copyEquippedToOutfit, KeyboardConfig::KEY_NO_VALUE, 50, COND_GAME | COND_VALIDSPEED}, - {"", 0, N_("Chat Keys"), 0, nullptr, KeyboardConfig::KEY_NO_VALUE, 50, + {"", 0, + N_("Chat Keys"), + 0, + nullptr, + KeyboardConfig::KEY_NO_VALUE, 50, COND_DEFAULT}, {"keyChat", SDLK_RETURN, N_("Toggle Chat"), @@ -836,19 +852,35 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = { &ActionManager::closeChatTab, KeyboardConfig::KEY_NO_VALUE, 50, COND_NOINPUT}, - {"keyChatPrevHistory", SDLK_KP7, N_("Previous chat line"), - KeyboardConfig::GRP_CHAT, nullptr, KeyboardConfig::KEY_NO_VALUE, 50, + {"keyChatPrevHistory", SDLK_KP7, + N_("Previous chat line"), + KeyboardConfig::GRP_CHAT, + nullptr, + KeyboardConfig::KEY_NO_VALUE, 50, COND_DEFAULT}, - {"keyChatNextHistory", SDLK_KP9, N_("Next chat line"), - KeyboardConfig::GRP_CHAT, nullptr, KeyboardConfig::KEY_NO_VALUE, 50, + {"keyChatNextHistory", SDLK_KP9, + N_("Next chat line"), + KeyboardConfig::GRP_CHAT, + nullptr, + KeyboardConfig::KEY_NO_VALUE, 50, COND_DEFAULT}, - {"keyAutoCompleteChat", SDLK_TAB, N_("Chat Auto Complete"), - KeyboardConfig::GRP_CHAT, nullptr, KeyboardConfig::KEY_NO_VALUE, 50, + {"keyAutoCompleteChat", SDLK_TAB, + N_("Chat Auto Complete"), + KeyboardConfig::GRP_CHAT, + nullptr, + KeyboardConfig::KEY_NO_VALUE, 50, COND_DEFAULT}, - {"keyDeActivateChat", SDLK_ESCAPE, N_("Deactivate Chat Input"), - KeyboardConfig::GRP_CHAT, nullptr, KeyboardConfig::KEY_NO_VALUE, 50, + {"keyDeActivateChat", SDLK_ESCAPE, + N_("Deactivate Chat Input"), + KeyboardConfig::GRP_CHAT, + nullptr, + KeyboardConfig::KEY_NO_VALUE, 50, COND_DEFAULT}, - {"", 0, N_("Other Keys"), 0, nullptr, KeyboardConfig::KEY_NO_VALUE, 50, + {"", 0, + N_("Other Keys"), + 0, + nullptr, + KeyboardConfig::KEY_NO_VALUE, 50, COND_DEFAULT}, {"keyIgnoreInput1", SDLK_LSUPER, N_("Ignore input 1"), |