From 0ec4e46bf08fbca2071454d75d727afba05da64d Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Sun, 24 Mar 2024 13:15:58 +0100 Subject: [PATCH] SDL2 bugfix to shmup and game_keys_scroll --- control.cpp | 2 +- multi.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/control.cpp b/control.cpp index cd15dcd2..8747c547 100644 --- a/control.cpp +++ b/control.cpp @@ -957,7 +957,7 @@ EX void mainloopiter() { } else sc_ticks = ticks; - if(game_keys_scroll && !shmup::on && (cmode & sm::NORMAL) && !keystate[SDLK_LALT] && !keystate[SDLK_RALT]) { + if(game_keys_scroll && !shmup::on && (cmode & sm::NORMAL) && !keystate[SDL12(SDLK_LALT, SDL_SCANCODE_LALT)] && !keystate[SDL12(SDLK_RALT, SDL_SCANCODE_RALT)]) { rug::using_rugview urv; auto& lastticks = sc_ticks2; ld t = (ticks - lastticks) * shiftmul / 1000.; diff --git a/multi.cpp b/multi.cpp index 33ccb743..22fde609 100644 --- a/multi.cpp +++ b/multi.cpp @@ -821,7 +821,8 @@ EX void handleInput(int delta, config &scfg) { get_actions(scfg); const Uint8 *keystate = SDL12_GetKeyState(NULL); - if(keystate[SDLK_LCTRL] || keystate[SDLK_RCTRL]) d /= 5; + + if(keystate[SDL12(SDLK_LCTRL, SDL_SCANCODE_LCTRL)] || keystate[SDL12(SDLK_RCTRL, SDL_SCANCODE_RCTRL)]) d /= 5; double panx = actionspressed[49] - actionspressed[51] + axespressed[2] / 32000.0;