diff options
Diffstat (limited to 'src/keyboarddata.h')
-rw-r--r-- | src/keyboarddata.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/keyboarddata.h b/src/keyboarddata.h index 79da45049..c22ca08fc 100644 --- a/src/keyboarddata.h +++ b/src/keyboarddata.h @@ -109,7 +109,7 @@ static const KeyData keyData[Input::KEY_TOTAL] = { Input::GRP_DEFAULT, nullptr, Input::KEY_NO_VALUE, 50, - COND_DEFAULT}, + COND_DEFAULT | COND_INGAME}, {"keyTalk", INPUT_KEYBOARD, SDLK_t, INPUT_UNKNOWN, Input::KEY_NO_VALUE, @@ -221,7 +221,7 @@ static const KeyData keyData[Input::KEY_TOTAL] = { Input::GRP_DEFAULT, nullptr, Input::KEY_NO_VALUE, 50, - COND_DEFAULT}, + COND_DEFAULT | COND_INGAME}, {"keyShortcut1", INPUT_KEYBOARD, SDLK_1, INPUT_UNKNOWN, Input::KEY_NO_VALUE, @@ -368,7 +368,7 @@ static const KeyData keyData[Input::KEY_TOTAL] = { Input::GRP_DEFAULT | Input::GRP_GUI, &ActionManager::helpWindowShow, Input::KEY_NO_VALUE, 50, - COND_GAME | COND_NOTARGET}, + COND_SHORTCUT}, {"keyWindowStatus", INPUT_KEYBOARD, SDLK_F2, INPUT_UNKNOWN, Input::KEY_NO_VALUE, @@ -515,21 +515,21 @@ static const KeyData keyData[Input::KEY_TOTAL] = { Input::GRP_DEFAULT | Input::GRP_GUI, &ActionManager::prevSocialTab, Input::KEY_NO_VALUE, 50, - COND_NOINPUT}, + COND_NOINPUT | COND_INGAME}, {"keySocialNextTab", INPUT_UNKNOWN, Input::KEY_NO_VALUE, INPUT_UNKNOWN, Input::KEY_NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, &ActionManager::nextSocialTab, Input::KEY_NO_VALUE, 50, - COND_NOINPUT}, + COND_NOINPUT | COND_INGAME}, {"keySmilie", INPUT_KEYBOARD, SDLK_LALT, INPUT_UNKNOWN, Input::KEY_NO_VALUE, Input::GRP_DEFAULT, nullptr, Input::KEY_NO_VALUE, 50, - COND_DEFAULT}, + COND_DEFAULT | COND_INGAME}, {"keyEmoteShortcut1", INPUT_KEYBOARD, SDLK_1, INPUT_UNKNOWN, Input::KEY_NO_VALUE, @@ -872,14 +872,14 @@ static const KeyData keyData[Input::KEY_TOTAL] = { Input::GRP_DEFAULT, nullptr, Input::KEY_NO_VALUE, 50, - COND_DEFAULT}, + COND_DEFAULT | COND_INGAME}, {"keyCopyOutfit", INPUT_KEYBOARD, SDLK_RALT, INPUT_UNKNOWN, Input::KEY_NO_VALUE, Input::GRP_DEFAULT, nullptr, Input::KEY_NO_VALUE, 50, - COND_DEFAULT}, + COND_DEFAULT | COND_INGAME}, {"keyCopyEquipedOutfit", INPUT_KEYBOARD, SDLK_RIGHTBRACKET, INPUT_UNKNOWN, Input::KEY_NO_VALUE, @@ -1565,56 +1565,56 @@ static const KeyData keyData[Input::KEY_TOTAL] = { Input::GRP_DEFAULT | Input::GRP_CHAT, &ActionManager::toggleChat, Input::KEY_NO_VALUE, 50, - COND_NOINPUT | COND_NOAWAY | COND_NOMODAL}, + COND_NOINPUT | COND_NOAWAY | COND_NOMODAL | COND_INGAME}, {"keyChatScrollUp", INPUT_KEYBOARD, SDLK_PAGEUP, INPUT_UNKNOWN, Input::KEY_NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, &ActionManager::scrollChatUp, Input::KEY_NO_VALUE, 50, - COND_DEFAULT}, + COND_DEFAULT | COND_INGAME}, {"keyChatScrollDown", INPUT_KEYBOARD, SDLK_PAGEDOWN, INPUT_UNKNOWN, Input::KEY_NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, &ActionManager::scrollChatDown, Input::KEY_NO_VALUE, 50, - COND_DEFAULT}, + COND_DEFAULT | COND_INGAME}, {"keyChatPrevTab", INPUT_KEYBOARD, SDLK_KP7, INPUT_UNKNOWN, Input::KEY_NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, &ActionManager::prevChatTab, Input::KEY_NO_VALUE, 50, - COND_NOINPUT}, + COND_NOINPUT | COND_INGAME}, {"keyChatNextTab", INPUT_KEYBOARD, SDLK_KP9, INPUT_UNKNOWN, Input::KEY_NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, &ActionManager::nextChatTab, Input::KEY_NO_VALUE, 50, - COND_NOINPUT}, + COND_NOINPUT | COND_INGAME}, {"keyChatCloseTab", INPUT_UNKNOWN, Input::KEY_NO_VALUE, INPUT_UNKNOWN, Input::KEY_NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, &ActionManager::closeChatTab, Input::KEY_NO_VALUE, 50, - COND_NOINPUT}, + COND_NOINPUT | COND_INGAME}, {"keyChatPrevHistory", INPUT_KEYBOARD, SDLK_KP7, INPUT_UNKNOWN, Input::KEY_NO_VALUE, Input::GRP_CHAT | Input::GRP_GUICHAN, nullptr, Input::KEY_NO_VALUE, 50, - COND_DEFAULT}, + COND_DEFAULT | COND_INGAME}, {"keyChatNextHistory", INPUT_KEYBOARD, SDLK_KP9, INPUT_UNKNOWN, Input::KEY_NO_VALUE, Input::GRP_CHAT | Input::GRP_GUICHAN, nullptr, Input::KEY_NO_VALUE, 50, - COND_DEFAULT}, + COND_DEFAULT | COND_INGAME}, {"keyIgnoreInput1", #ifdef USE_SDL2 INPUT_UNKNOWN, Input::KEY_NO_VALUE, @@ -1797,7 +1797,7 @@ static const KeyData keyData[Input::KEY_TOTAL] = { Input::GRP_DEFAULT, &ActionManager::mouseClick, Input::KEY_NO_VALUE, 50, - COND_NOINPUT | COND_NOAWAY | COND_NOMODAL}, + COND_NOINPUT | COND_NOAWAY | COND_NOMODAL | COND_INGAME}, {"keyCameraMode", INPUT_KEYBOARD, SDLK_KP_PLUS, INPUT_UNKNOWN, Input::KEY_NO_VALUE, @@ -1937,7 +1937,7 @@ static const KeyData keyData[Input::KEY_TOTAL] = { Input::GRP_DEFAULT, &ActionManager::stopSit, Input::KEY_NO_VALUE, 50, - COND_DEFAULT}, + COND_DEFAULT | COND_INGAME}, {"keyShowKeyboard", INPUT_UNKNOWN, Input::KEY_NO_VALUE, INPUT_UNKNOWN, Input::KEY_NO_VALUE, @@ -1958,7 +1958,7 @@ static const KeyData keyData[Input::KEY_TOTAL] = { Input::GRP_CHAT, nullptr, Input::KEY_NO_VALUE, 50, - COND_DEFAULT} + COND_DEFAULT | COND_INGAME} }; #endif // KEYBOARDDATA_H |