eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Ubuntu 20.04 for CI

This commit is contained in:
Alexander Batalov 2022-06-13 18:25:33 +03:00
parent 96771e9cdd
commit 9098ad6486
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/Build.yml vendored
View File

@ -65,7 +65,7 @@ jobs:
# artifact ...... path to compiled application; use "NO" if given job run should not generate any artifacts (case sensitive) # artifact ...... path to compiled application; use "NO" if given job run should not generate any artifacts (case sensitive)
# artifact-os ... defines artifact name suffix # 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, 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: 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 } # { 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 }

2
src/core.cc
View File

@ -4278,9 +4278,11 @@ void _kb_init_lock_status()
gModifierKeysState |= MODIFIER_KEY_STATE_NUM_LOCK; gModifierKeysState |= MODIFIER_KEY_STATE_NUM_LOCK;
} }
#if SDL_VERSION_ATLEAST(2, 0, 18)
if ((SDL_GetModState() & KMOD_SCROLL) != 0) { if ((SDL_GetModState() & KMOD_SCROLL) != 0) {
gModifierKeysState |= MODIFIER_KEY_STATE_SCROLL_LOCK; gModifierKeysState |= MODIFIER_KEY_STATE_SCROLL_LOCK;
} }
#endif
} }
// Get pointer to pending key event from the queue but do not consume it. // Get pointer to pending key event from the queue but do not consume it.