mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-13 20:03:58 +02:00
Code Issues Projects Releases Wiki Activity

Fixed hotkey behaviour

Browse Source
This commit is contained in:
mathusummut
2019-02-05 15:14:19 +01:00
parent 8ed2ed4132
commit 04e3404d0e
26 changed files with 188 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/shared_lib/sources/platform/sdl/window.cpp
View File

@@ -800,7 +800,7 @@ namespace Shared {
return result;
}
bool isKeyPressed(SDL_Keycode compareKey, SDL_KeyboardEvent input, bool modifiersAllowed) {
bool isKey(SDL_Keycode compareKey, SDL_KeyboardEvent input, bool modifiersAllowed) {
vector<int> modifiersToCheck;
if (modifiersAllowed == false) {
modifiersToCheck.push_back(KMOD_LCTRL);
@@ -809,10 +809,11 @@ namespace Shared {
modifiersToCheck.push_back(KMOD_RALT);
}
bool result = isKeyPressed(compareKey, input, modifiersToCheck);
bool result = isKey(compareKey, input, modifiersToCheck);
return result;
}
bool isKeyPressed(SDL_Keycode compareKey, SDL_KeyboardEvent input, vector<int> modifiersToCheck) {
bool isKey(SDL_Keycode compareKey, SDL_KeyboardEvent input, vector<int> modifiersToCheck) {
//Uint16 c = SDLK_UNKNOWN;
SDL_Keycode c = SDLK_UNKNOWN;
//if(input.keysym.unicode > 0 && input.keysym.unicode < 0x80) {
@@ -820,7 +821,7 @@ namespace Shared {
c = input.keysym.sym;
}
//printf("START isKeyPressed input = %d compare = %d mod = %d\n",c,compareKey,input.keysym.mod);
//printf("START isKey input = %d compare = %d mod = %d\n",c,compareKey,input.keysym.mod);
// if(compareKey == SDLK_QUESTION && (c == SDLK_SLASH && (input.keysym.mod & (KMOD_SHIFT)))) {