From 9098ad64860fabce197f5c25dd7021a8fe645d83 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Mon, 13 Jun 2022 18:25:33 +0300 Subject: [PATCH] Use Ubuntu 20.04 for CI --- .github/workflows/Build.yml | 2 +- src/core.cc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 26bb6bc..4be625f 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -65,7 +65,7 @@ jobs: # artifact ...... path to compiled application; use "NO" if given job run should not generate any artifacts (case sensitive) # artifact-os ... defines artifact name suffix # - - { name: Linux GCC, os: ubuntu-22.04, cc: gcc, cxx: g++, ver: null, arch: 32, generator: "Unix Makefiles", can-fail: false, artifact: Build/fallout2-ce, artifact-os: linux } + - { name: Linux GCC, os: ubuntu-20.04, cc: gcc, cxx: g++, ver: null, arch: 32, generator: "Unix Makefiles", can-fail: false, artifact: Build/fallout2-ce, artifact-os: linux } # { name: Linux GCC, os: ubuntu-22.04, cc: gcc, cxx: g++, ver: null, arch: 64, generator: "Unix Makefiles", can-fail: true, artifact: Build/fallout2-ce, artifact-os: linux } - { name: Linux GCC 10, os: ubuntu-22.04, cc: gcc, cxx: g++, ver: 10, arch: 32, generator: "Unix Makefiles", can-fail: false, artifact: NO, artifact-os: linux } # { name: Linux GCC 10, os: ubuntu-22.04, cc: gcc, cxx: g++, ver: 10, arch: 64, generator: "Unix Makefiles", can-fail: true, artifact: NO, artifact-os: linux } diff --git a/src/core.cc b/src/core.cc index 61a86be..3e2131d 100644 --- a/src/core.cc +++ b/src/core.cc @@ -4278,9 +4278,11 @@ void _kb_init_lock_status() gModifierKeysState |= MODIFIER_KEY_STATE_NUM_LOCK; } +#if SDL_VERSION_ATLEAST(2, 0, 18) if ((SDL_GetModState() & KMOD_SCROLL) != 0) { gModifierKeysState |= MODIFIER_KEY_STATE_SCROLL_LOCK; } +#endif } // Get pointer to pending key event from the queue but do not consume it.