X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;fp=src%2Fevents.c;h=39a1e4e928b4ebe1b930742b6ed9b54496ac17f7;hp=c1c5e00d42994d454b4835ce82e36123fb13b360;hb=9e5b242142cda73a8b1ae8ae52aa927999b5481d;hpb=cb0ddc73cbd791f57009f4b2e9037069fb6cdff0 diff --git a/src/events.c b/src/events.c index c1c5e00d..39a1e4e9 100644 --- a/src/events.c +++ b/src/events.c @@ -1458,16 +1458,13 @@ void HandlePauseResumeEvent(PauseResumeEvent *event) void HandleKeyEvent(KeyEvent *event) { int key_status = (event->type == EVENT_KEYPRESS ? KEY_PRESSED : KEY_RELEASED); - boolean with_modifiers = (game_status == GAME_MODE_PLAYING ? FALSE : TRUE); - Key key = GetEventKey(event, with_modifiers); - Key keymod = (with_modifiers ? GetEventKey(event, FALSE) : key); + Key key = GetEventKey(event); #if DEBUG_EVENTS_KEY - Debug("event:key", "key was %s, keysym.scancode == %d, keysym.sym == %d, keymod = %d, GetKeyModState() = 0x%04x, resulting key == %d (%s)", + Debug("event:key", "key was %s, keysym.scancode == %d, keysym.sym == %d, GetKeyModState() = 0x%04x, resulting key == %d (%s)", event->type == EVENT_KEYPRESS ? "pressed" : "released", event->keysym.scancode, event->keysym.sym, - keymod, GetKeyModState(), key, getKeyNameFromKey(key)); @@ -1495,7 +1492,7 @@ void HandleKeyEvent(KeyEvent *event) } #endif - HandleKeyModState(keymod, key_status); + HandleKeyModState(key, key_status); // process all keys if not in text input mode or if non-printable keys if (!checkTextInputKey(key))