Harden input reset on activation changes

On Mac, when on worldmap, cmd-tab out of a windowed game then back locks the game 100% of the time for me.  This PR does a more thorough reset of the input to prevent it from getting out of sync

.github/PULL_REQUEST_TEMPLATE.md

@@ -17,15 +17,5 @@
 
 - *Preview builds are not available for pull requests from forked repositories.* To enable preview builds, submit the PR from a branch within this repository. 
 
-- *Formatting issues? You have two options:*
-1. **Fix formatting automatically** using the following Docker command: *(If you're using Windows, remove `--user $(id -u):$(id -g)`)* 
-```bash
-docker run --rm \
-  -v $(pwd):/app --workdir /app  \
-  --user $(id -u):$(id -g) silkeh/clang:18 \
-  bash -c 'find src -type f -name \*.cc -o -name \*.h | xargs clang-format -i'
-```
-2. **Skip formatting check** by adding the `skip-formatting` label to this PR.
-
 --->
 

.github/workflows/ci-build.yml

@@ -320,9 +320,7 @@ jobs:
       matrix:
         include:
           - arch: x86
-            generator-platform: Win32
           - arch: x64
-            generator-platform: x64
 
     steps:
       - name: Clone
@@ -337,18 +335,20 @@ jobs:
         uses: actions/cache@v4
         with:
           path: out
-          key: windows-${{ matrix.arch }}-cmake-v102
+          key: windows-${{ matrix.arch }}-cmake-v103
 
       - name: Configure
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
+          for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.v141.x86.x64 Microsoft.VisualStudio.Component.VC.v141.xp -property installationPath`) do set "VS_PATH=%%i"
+          call "%VS_PATH%\Common7\Tools\VsDevCmd.bat" ^
           && cmake --preset windows-${{ matrix.arch }}
 
       - name: Build
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
+          for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.v141.x86.x64 Microsoft.VisualStudio.Component.VC.v141.xp -property installationPath`) do set "VS_PATH=%%i"
+          call "%VS_PATH%\Common7\Tools\VsDevCmd.bat" ^
           && cmake --build --preset windows-${{ matrix.arch }}-release
 
       - name: Change executable file name

.github/workflows/release.yml

@@ -250,40 +250,40 @@ jobs:
       matrix:
         include:
           - arch: x86
-            generator-platform: Win32
           - arch: x64
-            generator-platform: x64
 
     steps:
       - name: Clone
         uses: actions/checkout@v4
 
-      - name: Install Visual Studio 2019 Build Tools with v141_xp
+      - name: Install Visual Studio 2022 Build Tools with v141_xp
         shell: cmd
         run: |
-          choco install visualstudio2019buildtools -y --package-parameters="'--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.xp --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK.10240 --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP --add Microsoft.VisualStudio.Component.WinXP'"
+          choco install visualstudio2022buildtools -y --package-parameters="'--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.xp --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK.10240 --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP --add Microsoft.VisualStudio.Component.WinXP'"
 
       - name: Cache cmake build
         uses: actions/cache@v4
         with:
-          path: build
-          key: windows-${{ matrix.arch }}-cmake-v1
+          path: out
+          key: windows-${{ matrix.arch }}-cmake-v2
 
       - name: Configure
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
-          && cmake -B build -G "Visual Studio 16 2019" -A ${{ matrix.generator-platform }}
+          for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.v141.x86.x64 Microsoft.VisualStudio.Component.VC.v141.xp -property installationPath`) do set "VS_PATH=%%i"
+          call "%VS_PATH%\Common7\Tools\VsDevCmd.bat" ^
+          && cmake --preset windows-${{ matrix.arch }}
 
       - name: Build
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
-          && cmake --build build --config RelWithDebInfo
+          for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.v141.x86.x64 Microsoft.VisualStudio.Component.VC.v141.xp -property installationPath`) do set "VS_PATH=%%i"
+          call "%VS_PATH%\Common7\Tools\VsDevCmd.bat" ^
+          && cmake --build --preset windows-${{ matrix.arch }}-release
 
       - name: Upload
         run: |
-          cd build/RelWithDebInfo
+          cd out/build/windows-${{ matrix.arch }}/RelWithDebInfo
           7z a fallout2-ce-windows-${{ matrix.arch }}.zip fallout2-ce.exe
           gh release upload ${{ github.event.release.tag_name }} fallout2-ce-windows-${{ matrix.arch }}.zip
           rm fallout2-ce-windows-${{ matrix.arch }}.zip

.gitignore

@@ -10,6 +10,7 @@
 *.userosscache
 *.sln.docstates
 .DS_Store
+.local-tools/
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -399,3 +400,15 @@ FodyWeavers.xsd
 # versioning header
 src/platform/git_version.h
 CMakeUserPresets.json
+
+# Local configs for AI agents
+.opencode
+.agents
+.aider*
+.gemini
+.claude
+.mcp.json
+AGENTS.md
+CLAUDE.md
+GEMINI.md
+opencode.json

CMakeLists.txt

@@ -20,6 +20,10 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 set(CMAKE_CXX_EXTENSIONS NO)
 
+if(MSVC)
+    add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/EHsc>)
+endif()
+
 option(FALLOUT_VENDORED "Use vendored third-party libraries" ON)
 
 if(ANDROID)
@@ -62,6 +66,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/combat.h"
     "src/config.cc"
     "src/config.h"
+    "src/content_config.cc"
+    "src/content_config.h"
     "src/credits.cc"
     "src/credits.h"
     "src/critter.cc"
@@ -102,6 +108,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/font_manager.h"
     "src/game_config.cc"
     "src/game_config.h"
+    "src/game_config_migration.cc"
+    "src/game_config_migration.h"
     "src/game_dialog.cc"
     "src/game_dialog.h"
     "src/game_memory.cc"
@@ -172,6 +180,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/obj_types.h"
     "src/object.cc"
     "src/object.h"
+    "src/opcode_context.cc"
+    "src/opcode_context.h"
     "src/options.cc"
     "src/options.h"
     "src/palette.cc"
@@ -289,6 +299,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/sfall_script_hooks.cc"
     "src/sfall_arrays.cc"
     "src/sfall_arrays.h"
+    "src/sfall_animation.cc"
+    "src/sfall_animation.h"
     "src/sfall_callbacks.cc"
     "src/sfall_callbacks.h"
     "src/touch.cc"
@@ -432,6 +444,7 @@ endif()
 
 add_subdirectory("third_party/fpattern")
 target_link_libraries(${EXECUTABLE_NAME} fpattern::fpattern)
+target_link_libraries(${EXECUTABLE_NAME} fpattern_windows::fpattern_windows)
 
 target_link_libraries(${EXECUTABLE_NAME} ${ZLIB_LIBRARIES})
 target_include_directories(${EXECUTABLE_NAME} PRIVATE ${ZLIB_INCLUDE_DIRS})
@@ -439,6 +452,35 @@ target_include_directories(${EXECUTABLE_NAME} PRIVATE ${ZLIB_INCLUDE_DIRS})
 target_link_libraries(${EXECUTABLE_NAME} ${SDL2_LIBRARIES})
 target_include_directories(${EXECUTABLE_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})
 
+if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
+    add_executable(fallout2-dat
+        "tools/dat_tool.cc"
+        "tools/dat_archive.cc"
+        "tools/fo1_dat_lzss.cc"
+        "src/dfile.cc"
+        "src/platform_compat.cc"
+    )
+
+    if(APPLE)
+        set_target_properties(fallout2-dat PROPERTIES
+            XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO"
+            XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO"
+        )
+    endif()
+
+    target_link_libraries(fallout2-dat
+        fpattern_windows::fpattern_windows
+        ${ZLIB_LIBRARIES}
+        ${SDL2_LIBRARIES}
+    )
+    if(WIN32)
+        target_link_libraries(fallout2-dat winmm)
+    endif()
+    target_include_directories(fallout2-dat PRIVATE "src")
+    target_include_directories(fallout2-dat PRIVATE ${ZLIB_INCLUDE_DIRS})
+    target_include_directories(fallout2-dat PRIVATE ${SDL2_INCLUDE_DIRS})
+endif()
+
 if(APPLE)
     if(IOS)
         install(TARGETS ${EXECUTABLE_NAME} DESTINATION "Payload")
@@ -509,28 +551,3 @@ if(CMAKE_SYSTEM_NAME MATCHES "Emscripten")
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
 endif()
-
-# Optional path to which the built executable and PDB will be copied after build.
-# Can be set via -DCOPY_TO_PATH=/some/path or through the CMake/CLion GUI.
-set(COPY_TO_PATH "" CACHE PATH "Destination directory for copying the executable and PDB after build")
-
-if(DEFINED COPY_TO_PATH AND NOT "${COPY_TO_PATH}" STREQUAL "")
-    add_custom_command(TARGET ${EXECUTABLE_NAME} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E make_directory "${COPY_TO_PATH}"
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            "$<TARGET_FILE:${EXECUTABLE_NAME}>"
-            "${COPY_TO_PATH}/"
-        COMMAND ${CMAKE_COMMAND} -E echo "Copied executable to ${COPY_TO_PATH}"
-    )
-    if(MSVC)
-        add_custom_command(TARGET ${EXECUTABLE_NAME} POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                "$<TARGET_PDB_FILE:${EXECUTABLE_NAME}>"
-                "${COPY_TO_PATH}/"
-                COMMAND ${CMAKE_COMMAND} -E echo "Copied PDB to ${COPY_TO_PATH}"
-        )
-        message(STATUS "Will copy executable and PDB to: ${COPY_TO_PATH}")
-    else()
-        message(STATUS "Will copy executable to: ${COPY_TO_PATH}")
-    endif()
-endif()

CMakePresets.json

@@ -119,9 +119,6 @@
                 "base"
             ],
             "generator": "Xcode",
-            "cacheVariables": {
-                "CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY": ""
-            },
             "condition": {
                 "type": "equals",
                 "lhs": "${hostSystemName}",

CONTRIBUTING.md

@@ -0,0 +1,91 @@
+# Contributing
+
+This file is currently a shell to be filled in over time. For now, it only captures project-specific maintenance notes that are easy to miss.
+
+For current sfall compatibility status and the remaining work needed to close gaps, see [SFALL_COMPATIBILITY.md](SFALL_COMPATIBILITY.md).
+
+## Building
+
+The project uses CMake, so building mostly comes down to picking the right preset.
+
+## Commandline arguments
+
+- `--scan-unimplemented` - do an analysis of opcodes and hooks used by loaded mods
+- `--dev-load-game=1` - load the given save game automatically (useful for LLM automation)
+
+### macOS
+
+- Install the Command Line Tools if needed: `xcode-select --install`
+- Install the common build dependencies: `brew install cmake ninja`
+- Configure and build:
+
+```sh
+cmake -S . -B out/build/macos -G Ninja -DCMAKE_BUILD_TYPE=Debug
+cmake --build out/build/macos --target fallout2-ce
+```
+
+### Linux
+
+Install SDL and a toolchain:
+
+- Debian / Ubuntu:
+```sh
+sudo apt install build-essential cmake ninja-build libsdl2-dev zlib1g-dev
+```
+- Fedora:
+```sh
+sudo dnf install gcc-c++ cmake ninja-build SDL2-devel zlib-devel
+```
+- Arch Linux:
+```sh
+sudo pacman -S base-devel cmake ninja sdl2 zlib
+```
+
+Then build:
+```
+cmake -S . -B out/build/linux-x64-debug -G Ninja -DCMAKE_BUILD_TYPE=Debug
+cmake --build out/build/linux-x64-debug --target fallout2-ce
+```
+
+### Windows
+
+TODO: add Visual Studio build instructions. This will likely need a Visual Studio generator or preset plus the MSVC toolchain and Windows SDK.
+
+## `.dat` CLI Tool
+
+There is a small command-line archive tool in this repo for inspecting Fallout `.dat` files. It supports both Fallout 2 and Fallout 1 archives.
+
+From the repo root, build it with your normal CMake workflow, targeting `fallout2-dat`:
+
+`cmake --build out/build/<preset-name> --target fallout2-dat`
+
+The executable is written to your selected build directory, so the exact path will vary by preset and configuration.
+
+The current tool is read-only. Available commands:
+
+1. `./<BUILD_DIR>/fallout2-dat <archive.dat> list [pattern]`
+2. `./<BUILD_DIR>/fallout2-dat <archive.dat> info [pattern]`
+3. `./<BUILD_DIR>/fallout2-dat <archive.dat> extract [--lower] <output-dir> [pattern]`
+4. `./<BUILD_DIR>/fallout2-dat <archive.dat> cat <entry>`
+
+Use `--lower` with `extract` when you want every extracted file and directory name forced to lowercase.
+For example:
+
+`fallout2-dat master.dat extract --lower /tmp/fallout2-dat-lower data\\*`
+
+## Updating SDL
+
+SDL is pinned for native builds in `third_party/sdl2/CMakeLists.txt`. Right now, Android also relies on checked-in Java bindings in `os/android/app/src/main/java/org/libsdl/app`, and those bindings must match the SDL version fetched by CMake.
+
+When updating SDL:
+
+1. Update the SDL tag in `third_party/sdl2/CMakeLists.txt`.
+2. Run an Android build once so Gradle/CMake fetch the new SDL source tree.
+3. Copy the Android Java bindings from the fetched SDL checkout into `os/android/app/src/main/java/org/libsdl/app`.
+   Source path pattern:
+   `os/android/app/.cxx/<Variant>/<Hash>/arm64-v8a/_deps/sdl2-src/android-project/app/src/main/java/org/libsdl/app`
+4. Rebuild Android and confirm the SDL sync guard passes.
+
+The Android build contains a guard in `os/android/app/build.gradle` that fails if the checked-in Java bindings drift from the fetched native SDL source.
+
+This is a hack, not a good long-term setup. The Java bindings are still duplicated in the repo instead of being sourced from the same SDL tree as the native build. That should be improved so Android does not depend on a manual copy/sync step.

README.md

@@ -2,13 +2,15 @@
 
 Fallout 2 Community Edition is a fully working re-implementation of Fallout 2, with the same original gameplay, engine bugfixes, and some quality of life improvements, that works (mostly) hassle-free on multiple platforms.  This is a fork of the original project, which isn't getting regular updates.
 
-Popular Fallout 2 total conversion mods are partially supported. Original versions of Nevada and Sonora (that do not rely on extended features provided by Sfall) work. [Fallout 2 Restoration Project](https://github.com/BGforgeNet/Fallout2_Restoration_Project), [Fallout Et Tu](https://github.com/rotators/Fo1in2) and [Olympus 2207](https://olympus2207.com) are not yet supported. Other mods (particularly Resurrection and Yesterday) are not tested.
+Popular Fallout 2 total conversion mods are partially supported. Original versions of Nevada and Sonora (that do not rely on extended features provided by Sfall) work. [Fallout 2 Restoration Project](https://github.com/BGforgeNet/Fallout2_Restoration_Project) is supported (in Beta). [Fallout Et Tu](https://github.com/rotators/Fo1in2) and [Olympus 2207](https://olympus2207.com) are not yet supported. Other mods (particularly Resurrection and Yesterday) are not tested.
 
 There is also [Fallout Community Edition](https://github.com/alexbatalov/fallout1-ce) (not affiliated with this fork).
 
+For build and contributor notes, see [CONTRIBUTING.md](CONTRIBUTING.md).
+
 ## Installation
 
-You must own the game to play. Purchase your copy on [GOG](https://www.gog.com/game/fallout_2), [Epic Games](https://store.epicgames.com/p/fallout-2) or [Steam](https://store.steampowered.com/app/38410). Download latest [release](https://github.com/fallout2-ce/fallout2-ce/releases) or build from source. 
+You must own the game to play. Purchase your copy on [GOG](https://www.gog.com/game/fallout_2), [Epic Games](https://store.epicgames.com/p/fallout-2) or [Steam](https://store.steampowered.com/app/38410). Download latest [release](https://github.com/fallout2-ce/fallout2-ce/releases) or build from source.
 
 ### Windows
 
@@ -22,17 +24,10 @@ Download and copy `fallout2-ce.exe` to your `Fallout2` folder. It serves as a dr
 
 ```console
 $ sudo apt install innoextract
-$ innoextract ~/Downloads/setup_fallout2_2.1.0.18.exe -I app
-$ mv app Fallout2
+$ innoextract ~/Downloads/setup_fallout_2_1.02_gog_v1_\(77792\).exe -d Fallout2
 ```
 
-- Download and copy `fallout2-ce` to this folder.
-
-- Install [SDL2](https://libsdl.org/download-2.0.php):
-
-```console
-$ sudo apt install libsdl2-2.0-0
-```
+- Download the Linux release archive, extract `fallout2-ce`, and copy it into this folder.
 
 - Run `./fallout2-ce`.
 
@@ -48,13 +43,13 @@ $ sudo apt install libsdl2-2.0-0
 
 ```console
 $ brew install innoextract
-$ innoextract ~/Downloads/setup_fallout2_2.1.0.18.exe -I app
-$ mv app /Applications/Fallout2
+$ innoextract ~/Downloads/setup_fallout_2_1.02_gog_v1_\(77792\).exe -d fallout2
+$ mv fallout2 /Applications/Fallout2
 ```
 
-- Download and copy `fallout2-ce.app` to this folder.
+- [Download](https://github.com/fallout2-ce/fallout2-ce/releases) and copy `Fallout II Community Edition.app` to this folder.
 
-- Run `fallout2-ce.app`.
+- Run `Fallout II Community Edition.app`.
 
 ### Android
 
@@ -84,7 +79,7 @@ $ mv app /Applications/Fallout2
 
 ### Browser
 
-> **NOTE**: WebAssebly build with emscripten
+> **NOTE**: WebAssembly build with emscripten
 ```
 docker run --rm -v $(pwd):/src emscripten/emsdk:3.1.74 sh -c 'git config --global --add safe.directory "*" && mkdir -p build && cd build && emcmake cmake ../ -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain/Emscripten.cmake && emmake make'
 ```
@@ -96,59 +91,35 @@ The main configuration file is `fallout2.cfg`. There are several important setti
 
 The `sound` folder (with `music` folder inside) might be located either in `data` folder, or be in the Fallout folder. Update `music_path1` setting to match your hierarchy, usually it's `data/sound/music/` or `sound/music/`. Make sure it matches your path exactly (so it might be `SOUND/MUSIC/` if you've installed Fallout from CD). Music files themselves (with `ACM` extension) should be all uppercased, regardless of `sound` and `music` folders.
 
-The second configuration file is `f2_res.ini`. Use it to change game window size, enable/disable fullscreen mode and configure IFACE settings (the control bar at the bottom of the game screen).
+Additional settings for screen resolution, UI customization, and map options are now integrated into the main `fallout2.cfg` file (previously part of `f2_res.ini` from Mash's HRP). When Fallout 2 CE starts, if it detects an existing `f2_res.ini` file, it automatically migrates these settings into `fallout2.cfg`. After migration, `fallout2.cfg` becomes the single source of truth for this configuration.
+
+The following settings can be configured in `fallout2.cfg` under the `[screen]` and `[ui]` sections:
 
 ```ini
-[MAIN]
-SCR_WIDTH=1280
-SCR_HEIGHT=720
-WINDOWED=1 ; 0 = fullscreen
-SCALE_2X=1 ; 0 = original scale, 1 = 2x - requires increasing the minimum resolution from 640x480 to 1280x960.
+[screen]
+resolution_x=1600 ; actual game window size (screen resolution), in pixels
+resolution_y=1080
+windowed=1 ; 0 = fullscreen
+scale=2 ; 1 = original scale, 2 = 2x scale, etc. (e.g. at scale 2 and screen resolution 1920x1080, in-game resolution will be 960x540, thus every pixel is twice as wide and tall)
 
-[IFACE]
-; if IFACE_BAR_MODE=0 - the bottom of the map view window sits at the top of the IFACE Bar.
-; if IFACE_BAR_MODE=1 - the bottom of the map view window extends to the base of the screen and is overlapped by the IFACE Bar.
-IFACE_BAR_MODE=0
-
-;if IFACE_BAR_SIDE_ART=0 - Black, No Iface-bar side art used.
-;if IFACE_BAR_SIDE_ART=1 - Metal (grey) look Iface-bar side art used.
-;if IFACE_BAR_SIDE_ART=2 - Leather look Iface-bar side art used.
-;if IFACE_BAR_SIDE_ART=3-6 - Alternative Metal look Iface-bar side art used.
-;if IFACE_BAR_SIDE_ART=7 - Alternative Leather look Iface-bar side art used.
-;if IFACE_BAR_SIDE_ART=8 - Metal (brown) look Iface-bar side art used.
-IFACE_BAR_SIDE_ART=2
-
-;if IFACE_BAR_SIDES_ORI=0 - Iface-bar side graphics extend from the Iface-Bar to the Screen edges.
-;if IFACE_BAR_SIDES_ORI=1 - Iface-bar side graphics extend from the Screen edges to the Iface-Bar.
-IFACE_BAR_SIDES_ORI=0
-
-;This will increase the width of the interface bar expanding the area used to display text.
-;if IFACE_BAR_WIDTH=640 - Interface bar will remain at it's original width.
-;if IFACE_BAR_WIDTH=800 - Interface bar will use 800pix wide asset from f2_res.dat.
-;IFACE_BAR_WIDTH=640
-
-[STATIC_SCREENS]
-;if SPLASH_SCRN_SIZE=0 - Splash screen shows at original size if it fits, otherwise scales down while preserving aspect ratio.
-;if SPLASH_SCRN_SIZE=1 - Splash screen scales to fit the screen while preserving aspect ratio.
-;if SPLASH_SCRN_SIZE=2 - Splash screen stretches to fill the entire screen.
-SPLASH_SCRN_SIZE=0
-
-[MAPS]
-;if IGNORE_MAP_EDGES=0 - Hi-Res map scroll edges are enabled.
-;if IGNORE_MAP_EDGES=1 - Hi-Res map scroll edges are ignored.
-IGNORE_MAP_EDGES=0
+[ui]
+iface_bar_mode=0 ; 0 = interface bar below game window, 1 = interface bar overlaps game window
+iface_bar_width=800 ; Width of interface bar (640 = original, 800 = extended)
+iface_bar_side_art=2 ; Interface bar side art style (0=black, 1=metal grey, 2=leather, 3-8=alternative styles)
+iface_bar_sides_ori=0 ; Side graphics orientation (0=extend from bar to edges, 1=extend from edges to bar)
+splash_screen_size=1 ; Splash screen scaling (0=original size, 1=fit preserving aspect, 2=stretch to fill)
+ignore_map_edges=0 ; Hi-res map scroll edges (0=enabled, 1=ignored)
 ```
 
-Recommendations:
+**Recommendations:**
 - **Desktops**: Use any size you see fit.
 - **Tablets**: Set these values to logical resolution of your device, for example iPad Pro 11 is 1668x2388 (pixels), but it's logical resolution is 834x1194 (points).
 - **Mobile phones**: Set height to 480, calculate width according to your device screen (aspect) ratio, for example Samsung S21 is 20:9 device, so the width should be 480 * 20 / 9 = 1067.
 
-In time this stuff will receive in-game interface, right now you have to do it manually. For a sample f2_res.ini configuration file, containing all currently working settings use this link: [f2_res.ini](https://raw.githubusercontent.com/fallout2-ce/fallout2-ce/refs/heads/mainmenu/files/f2_res.ini)
+In time this stuff will receive in-game interface, right now you have to do it manually. To see all currently working fallout2.cfg settings, just run the game once and quit. It will be automatically updated with defaults for every supported setting.
+*Note*: Use of the IFACE_BAR settings requires the `f2_res.dat` file, which contains graphical assets. Various versions are available, but one compatible with the above settings can be found here: [f2_res.dat](https://github.com/fallout2-ce/fallout2-ce/raw/refs/heads/main/files/f2_res.dat)
 
-*Note*: use of the IFACE_BAR settings requires the f2_res.dat file, which contains graphical assets. Various versions are available, but one compatible with the above f2_res.ini be found here: [f2_res.dat](https://github.com/fallout2-ce/fallout2-ce/raw/refs/heads/mainmenu/files/f2_res.dat)
-
-The third configuration file is `ddraw.ini` (part of Sfall). There are dozens of options that adjust or override engine behaviour and gameplay mechanics. This file is intended for modders and advanced users.
+The second configuration file is `ddraw.ini` (part of Sfall). There are dozens of options that adjust or override engine behaviour and gameplay mechanics. This file is intended for modders and advanced users.
 
 For a sample ddraw.ini configuration file, containing all currently working settings use this link: [ddraw.ini](https://raw.githubusercontent.com/fallout2-ce/fallout2-ce/refs/heads/main/files/ddraw.ini)
 
@@ -165,11 +136,9 @@ For a sample ddraw.ini configuration file, containing all currently working sett
 
 ## Contributing
 
-Integrating Sfall goodies is the top priority. Quality of life updates are OK too. Please no large scale refactorings at this time as we need to reconcile changes from Reference Edition, which will make this process slow and error-prone. In any case open up an issue with your suggestion or to notify other people that something is being worked on.
+Integrating Sfall goodies is the top priority. Quality of life updates are OK too.  In any case open up an issue with your suggestion or to notify other people that something is being worked on.
 
-### Integrating Sfall
-
-There are literally hundreds if not thousands of fixes and features in sfall. I guess not all of them are needed in Community Edition, but for the sake of compatibility with big mods out there, let's integrate them all.
+For current sfall compatibility status and the remaining work needed to close gaps, see [SFALL_COMPATIBILITY.md](SFALL_COMPATIBILITY.md).
 
 ## License
 

SFALL_COMPATIBILITY.md

@@ -0,0 +1,128 @@
+# Sfall Compatibility
+
+This document tracks Fallout 2 CE compatibility with sfall.  This is for modders who need to know which Sfall features work in CE.
+
+For now, this covers opcodes/metarules, and hooks.  In the future, it will include other ways of modifying the engine (like ini files), and other Sfall-specific behaviour.
+
+## Settings (ddraw.ini → fallout2.cfg / game.cfg)
+
+Settings previously read from `ddraw.ini` have been moved into standard CE config files.
+
+Most settings that control game behavior (premade characters, extra message files, combat tweaks, worldmap, etc.) have been moved into [`<DAT>/config/game.cfg`](files/ce.dat/config/game.cfg), which is a content-mod config file intended to be overridden by mods. See that file for the full list with descriptions.
+
+The following settings were moved into [`fallout2.cfg`](files/fallout2.cfg) instead:
+
+| ddraw.ini section | ddraw.ini key | fallout2.cfg section | fallout2.cfg key |
+| --- | --- | --- | --- |
+| `Misc` | `SkipOpeningMovies` | `ui` | `skip_opening_movies` |
+| `Misc` | `DisplayKarmaChanges` | `ui` | `display_karma_changes` |
+| `Misc` | `DisplayBonusDamage` | `ui` | `display_bonus_damage` |
+| `Misc` | `NumbersInDialogue` | `ui` | `numbers_in_dialogue` |
+| `Misc` | `AutoQuickSave` | `ui` | `auto_quick_save` |
+| `Main` | `EnableHighResolutionStencil` | `ui` | `enable_high_resolution_stencil` |
+| `Misc` | `ConsoleOutputPath` | `debug` | `console_output_path` |
+| `Misc` | `GaplessMusic` | `sound` | `gapless_music` |
+| `Misc` | `ScreenshotsFormat` | `system` | `screenshots_format` |
+| `Misc` | `UseWalkDistance` | `qol` | `use_walk_distance` |
+| `Misc` | `AutoOpenDoors` | `qol` | `auto_open_doors` |
+
+## Opcodes / Metarules
+
+See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/) for documentation on specific functions.
+
+| Group | Opcodes In Group | Compatibility | Notes |
+| --- | --- | --- | --- |
+| Direct memory access| read_byte,short,int,string<br>write_byte,short,int,string<br>call_offset_vX | 🚫 | Not possible.  Open an issue if you need functionality not covered by other opcodes. |
+| Stats | get/set_pc_base_stat<br>get/set_pc_extra_stat<br>get/set_critter_base_stat<br>get/set_critter_extra_stat | ✅ | CE uses engine stat helpers here instead of sfall's direct proto-field behavior, so derived-stat update behavior can differ. |
+| Stats / Alter min/max | get/set_stat_min/max<br>set_pc_stat_min/max<br>set_npc_stat_min/max | not implemented | - |
+| Skills | get/set_critter_skill_points<br>get/set_available_skill_points<br>set_skill_max<br>set_critter_skill_mod<br>set_base_skill_mod<br>mod_skill_points_per_level | not implemented | - |
+| Graphics | graphics_funcs_available<br>force_graphics_refresh<br>get_screen_width<br>get_screen_height<br>set_palette | implemented: only get_screen_width, get_screen_height | - |
+| Shaders | load_shader<br>free_shader<br>activate_shader<br>deactivate_shader<br>set/get_shader_* | 🚫 | likely will not implement direct compatibility
+| Perks and traits | set_perk_image<br>set_perk_*<br>set_pyromaniac_mod<br>apply_heaveho_fix<br>set_swiftlearner_mod<br>has/set_fake_perk<br>has/set_fake_trait<br>set_selectable_perk<br>set_perkbox_title<br>show/hide_real_perks<br>perk_add_mode<br>clear_selectable_perks<br>add/remove_trait<br>seq_perk_freq | not implemented | - |
+| Virtual file system | fs_create<br>fs_copy<br>fs_find<br>fs_read/write_*<br>fs_delete<br>fs_size<br>fs_pos<br>fs_seek<br>fs_resize | 🚫 | Open an issue if you have a use case for these |
+| Combat / Knockback | set_weapon_knockback<br>set_target_knockback<br>set_attacker_knockback<br>remove_weapon_knockback<br>remove_target_knockback<br>remove_attacker_knockback | not implemented | - |
+| Maps and encounters | in_world_map<br>force_encounter<br>force_encounter_with_flags<br>set_map_time_multi<br>get/set_map_enter_position<br>exec_map_update_scripts<br>get/set_terrain_name<br>set_town_title<br>get/set_can_rest_on_map<br>set_rest_heal_time<br>set_rest_mode<br>set_worldmap_heal_time | implemented: in_world_map, force_encounter, force_encounter_with_flags, set_map_time_multi | - |
+| Maps and encounters / Worldmap | get_world_map_x/y_pos<br>set_world_map_pos | ✅ | - |
+| Audio | eax_available<br>set_eax_environment<br>play_sfall_sound<br>stop_sfall_sound | not implemented | *eax* opcodes will not be implemented |
+| Combat / Weapons and ammo | get/set_weapon_ammo_pid<br>get/set_weapon_ammo_count | ✅ | - |
+| Sfall / Version | sfall_ver_major<br>sfall_ver_minor<br>sfall_ver_build | ✅ | CE currently reports `4.3.4` |
+| Utility / Math | log, exponent, round, sqrt, abs, sin, cos, tan, arctan, ceil, ^, floor2, div | ✅ | - |
+| Keyboard and mouse | key_pressed<br>tap_key<br>get_mouse_x/y<br>get_mouse_buttons | ✅ | - |
+| Lists | list_begin<br>list_next<br>list_end<br>list_as_array<br>party_member_list | ✅ | - |
+| Explosions | set_attack_explosion_pattern<br>set_attack_explosion_art<br>set_attack_explosion_radius<br>set_attack_is_explosion_fire<br>set_explosion_radius<br>set_dynamite_damage<br>set_plastic_damage<br>get_explosion_damage<br>set_explosion_max_targets<br>item_make_explosive | ✅ except item_make_explosive | - |
+| Animations | reg_anim_combat_check<br>reg_anim_destroy<br>reg_anim_animate_and_hide<br>reg_anim_light<br>reg_anim_change_fid<br>reg_anim_take_out<br>reg_anim_turn_towards<br>reg_anim_callback<br>reg_anim_animate_and_move | ✅ except reg_anim_callback | - |
+| Art and appearance | art_exists<br>refresh_pc_art<br>art_cache_clear<br>set_hero_race<br>set_hero_style | implemented: art_exists, refresh_pc_art, art_cache_clear | - |
+| Tiles and paths | get_tile_fid<br>tile_under_cursor<br>tile_light<br>tile_get_objs<br>tile_refresh_display<br>obj_blocking_tile<br>tile_by_position<br>get_tile_ground_fid<br>get_tile_roof_fid<br>obj_blocking_line<br>path_find_to<br>objects_in_radius | ✅ | - |
+| Utility | sprintf<br>typeof<br>atoi<br>atof | ✅ | - |
+| Utility / Strings | string_split<br>substr<br>strlen<br>charcode<br>get_string_pointer<br>string_find<br>string_find_from<br>string_format<br>string_format_array<br>string_replace<br>string_to_case<br>string_compare | ✅ | `get_string_pointer` is deprecated and intentionally omitted. |
+| Interface / Tags | show_iface_tag<br>hide_iface_tag<br>is_iface_tag_active<br>set_iface_tag_text<br>add_iface_tag | ✅ except set_iface_tag_text, add_iface_tag | CE only handles built-in interface tags here; custom tag creation/text is not supported yet. |
+| Global variables | set_sfall_global<br>get_sfall_global_int<br>get_sfall_global_float | ✅ except get_sfall_global_float | Current CE storage is int-backed; `set_sfall_global` stores integer values |
+| Hooks / Hook functions | init_hook<br>get_sfall_arg<br>get_sfall_args<br>get_sfall_arg_at<br>set_sfall_return<br>set_sfall_arg<br>register_hook<br>register_hook_proc<br>register_hook_proc_spec | ✅ | See below for implemented hooks. `init_hook` is deprecated and will not be implemented. register_hook_proc and register_hook_proc_spec both add hooks to the *end* of the hook list, instead of beginning and end, respectively. |
+| Arrays / Array functions | create_array<br>temp_array<br>fix_array<br>get/set_array<br>resize_array<br>free_array<br>scan_array<br>len_array<br>save/load_array<br>array_key<br>arrayexpr | ✅ except save_array, load_array | - |
+| Perks and traits / NPC perks | set_fake_perk_npc<br>set_fake_trait_npc<br>set_selectable_perk_npc<br>has_fake_perk_npc<br>has_fake_trait_npc | not implemented | - |
+| Global scripts / Global script functions | set_global_script_repeat<br>set_global_script_type<br>available_global_script_types | ✅ except available_global_script_types | - |
+| Combat | attack_is_aimed<br>block_combat<br>force_aimed_shots<br>disable_aimed_shots<br>get_attack_type<br>get/set_bodypart_hit_modifier<br>combat_data<br>get/set/reset_critical_table<br>get_last_target<br>get_last_attacker<br>set_critter_burst_disable<br>get/set_critter_current_ap<br>set_spray_settings<br>get/set_combat_free_move | implemented: get_attack_type, get/set_bodypart_hit_modifier, combat_data, get/set_critter_current_ap, get/set_combat_free_move | - |
+| Car | set_car_current_town<br>car_gas_amount<br>set_car_intface_art | implemented: all except set_car_intface_art | - |
+| Interface / Windows and images | art_frame_data<br>interface_art_draw<br>interface_print<br>draw_image<br>draw_image_scaled<br>get_window_under_mouse<br>create_win<br>get_window_attribute<br>message_box<br>set_window_flag<br>win_fill_color<br>interface_overlay<br>dialog_message<br>get_text_width<br>hide_window<br>show_window<br>create_message_window | implemented: only message_box, get_text_width, show_window, create_message_window | - |
+| Interface / Outline | outlined_object<br>get_outline<br>set_outline | ✅ | - |
+| Interface / Main interface | intface_is_hidden<br>intface_redraw<br>intface_hide<br>intface_show<br>set_quest_failure_value | implemented: only intface_redraw | `intface_redraw` only supports the zero-argument form; the optional-argument path is explicitly unimplemented. |
+| Interface / Inventory | display_stats<br>inventory_redraw<br>critter_inven_obj2<br>get_current_inven_size<br>item_weight | implemented: critter_inven_obj2, item_weight | - |
+| Interface / Cursor | get/set_cursor_mode | ✅ | - |
+| Locks | lock_is_jammed<br>unjam_lock<br>set_unjam_locks_time | not implemented | - |
+| INI settings | get_ini_setting<br>get_ini_string<br>get_ini_section<br>get_ini_sections<br>get_ini_config<br>get_ini_config_db<br>set_ini_setting | ✅ except get_ini_config, get_ini_config_db | `modified_ini` is intentionally omitted as deprecated. |
+| Objects and scripts | set_self<br>set_dude_obj<br>real_dude_obj<br>remove_script<br>get/set_script<br>obj_is_carrying_obj<br>loot_obj<br>dialog_obj<br>obj_under_cursor<br>get/set_object_data<br>get/set_flags<br>set_unique_id<br>set_scr_name<br>obj_is_openable<br>get/set_proto_data<br>get_object_ai_data | implemented: set_self, get/set/remove_script, obj_is_carrying_obj, loot_obj, dialog_obj, obj_under_cursor, get_object_data, get_flags, set_flags, obj_is_openable, get_proto_data, set_proto_data | - |
+| Other / Game management | set_movie_path<br>stop/resume_game<br>mark_movie_played<br>game_loaded<br>get_game_mode<br>get_uptime<br>signal_close_game | implemented: game_loaded, get_game_mode, get_uptime, signal_close_game | - |
+| Gameplay tweaks | set_pickpocket_max<br>set_hit_chance_max<br>set_xp_mod<br>set_critter_hit_chance_mod<br>set_base_hit_chance_mod<br>set_hp_per_level_mod<br>gdialog_get_barter_mod<br>get/set_unspent_ap_bonus<br>get/<br>set_base_pickpocket_mod<br>set_critter_pickpocket_mod<br>get/set_inven_ap_cost<br>set_drugs_data<br>get_kill_counter<br>mod_kill_counter<br>set_pipboy_available | implemented: gdialog_get_barter_mod | - |
+| NPCs | inc_npc_level<br>get_npc_level<br>npc_engine_level_up | not implemented | - |
+| Other | get_year<br>set_dm/df_model<br>active_hand<br>toggle_active_hand<br>get/set_viewport_x/y<br>hero_select_win<br>get_light_level<br>message_str_game<br>sneak_success<br>create_spatial<br>unwield_slot<br>add_g_timer_event<br>add_extra_msg_file<br>get_metarule_table<br>metarule_exist<br>remove_timer_event<br>spatial_radius | implemented: get_year, active_hand, toggle_active_hand, get_light_level, message_str_game, add_extra_msg_file, metarule_exist | `input_funcs_available`, `nb_create_char` are deprecated in sfall and intentionally absent in CE. `add_extra_msg_file` does not support the explicit `fileNumber` form in CE. |
+
+## Hooks
+
+| Hook | ID | Compatibility | Notes |
+| --- | --- | --- | --- |
+| ToHit | `HOOK_TOHIT` | ✅ | - |
+| AfterHitRoll | `HOOK_AFTERHITROLL` | 🚫 | Et tu |
+| CalcAPCost | `HOOK_CALCAPCOST` | ✅ | - |
+| DeathAnim1 | `HOOK_DEATHANIM1` | 🚫 | Use DEATHANIM2 instead |
+| DeathAnim2 | `HOOK_DEATHANIM2` | ✅ | - |
+| CombatDamage | `HOOK_COMBATDAMAGE` | ✅ | - |
+| OnDeath | `HOOK_ONDEATH` | ✅ | - |
+| FindTarget | `HOOK_FINDTARGET` | 🚫 | (maybe) |
+| UseObjOn | `HOOK_USEOBJON` | ✅ | - |
+| UseObj | `HOOK_USEOBJ` | ✅ | CE notes an sfall-matching inconsistency around return code `2` behavior between interface contexts. |
+| RemoveInvenObj | `HOOK_REMOVEINVENOBJ` | 🚫 | - |
+| BarterPrice | `HOOK_BARTERPRICE` | ✅ | - |
+| MoveCost | `HOOK_MOVECOST` | 🚫 | - |
+| ItemDamage | `HOOK_ITEMDAMAGE` | 🚫 | - |
+| AmmoCost | `HOOK_AMMOCOST` | 🚫 | Et tu |
+| KeyPress | `HOOK_KEYPRESS` | ✅ | Third hook arg is currently `0`; CE doesn't use VK codes. |
+| MouseClick | `HOOK_MOUSECLICK` | ✅ | - |
+| UseSkill | `HOOK_USESKILL` | 🚫 | - |
+| Steal | `HOOK_STEAL` | 🚫 | Et tu |
+| WithinPerception | `HOOK_WITHINPERCEPTION` | ✅ | - |
+| InventoryMove | `HOOK_INVENTORYMOVE` | ✅ | - |
+| InvenWield | `HOOK_INVENWIELD` | 🚫 | - |
+| AdjustFID | `HOOK_ADJUSTFID` | 🚫 | - |
+| CombatTurn | `HOOK_COMBATTURN` | ✅ | - |
+| StdProcedure | `HOOK_STDPROCEDURE` | ✅ | - |
+| StdProcedureEnd | `HOOK_STDPROCEDURE_END` | ✅ | - |
+| CarTravel | `HOOK_CARTRAVEL` | 🚫 | - |
+| SetGlobalVar | `HOOK_SETGLOBALVAR` | 🚫 | - |
+| RestTimer | `HOOK_RESTTIMER` | 🚫 | Et tu |
+| GameModeChange | `HOOK_GAMEMODECHANGE` | ✅ | - |
+| UseAnimObj | `HOOK_USEANIMOBJ` | 🚫 | Et tu; (maybe) |
+| ExplosiveTimer | `HOOK_EXPLOSIVETIMER` | 🚫 | - |
+| DescriptionObj | `HOOK_DESCRIPTIONOBJ` | 🚫 | Et tu |
+| UseSkillOn | `HOOK_USESKILLON` | 🚫 | Et tu |
+| OnExplosion | `HOOK_ONEXPLOSION` | 🚫 | (maybe) |
+| SubCombatDamage | `HOOK_SUBCOMBATDAMAGE` | 🚫 | (maybe) |
+| SetLighting | `HOOK_SETLIGHTING` | 🚫 | Et tu; (maybe) |
+| Sneak | `HOOK_SNEAK` | 🚫 | - |
+| TargetObject | `HOOK_TARGETOBJECT` | 🚫 | (maybe) |
+| Encounter | `HOOK_ENCOUNTER` | 🚫 | Et tu |
+| AdjustPoison | `HOOK_ADJUSTPOISON` | 🚫 | (maybe) |
+| AdjustRads | `HOOK_ADJUSTRADS` | 🚫 | (maybe) |
+| RollCheck | `HOOK_ROLLCHECK` | 🚫 | - |
+| BestWeapon | `HOOK_BESTWEAPON` | 🚫 | - |
+| CanUseWeapon | `HOOK_CANUSEWEAPON` | 🚫 | - |
+| BuildSfxWeapon | `HOOK_BUILDSFXWEAPON` | 🚫 | - |

files/ce.dat/config/game.cfg

@@ -0,0 +1,128 @@
+;
+; Game general config
+;
+; Fallout 2
+;
+
+[start]
+; Starting year, month, day. Month and day are 0-indexed (0 = January, 0 = first day of month).
+year=2241
+month=6
+day=24
+; To start a new game somewhere other than artemple.map, set this to the map file name.
+map=
+; Starting (tribal) and default (jumpsuit) player models. Can also be changed in-game via script.
+model_male=hmwarr
+model_male_default=hmjmps
+model_female=hfprim
+model_female_default=hfjmps
+; Set to 1 if you want the pipboy to be available at the start of the game.
+; Set to 2 to make the pipboy available by only skipping the vault suit movie check.
+pipboy=0
+
+[karma]
+; FRM numbers for karma icons on the character screen. Number of points entries should be 1 less than number of frms entries.
+; Example: frms=47,48,49  points=-100,100
+frms=
+points=
+
+[items]
+; Proto IDs for healing items.
+stimpak=40
+super_stimpak=144
+healing_powder=273
+
+[dialog]
+; Set to 1 to prevent using 0 to escape from dialogue at any time.
+no_exit_hotkey=1
+; Set to 1 to allow using '^' in dialog msg files to specify gender-based alternative text.
+; Text must be enclosed in angle brackets, e.g. <MaleText^FemaleText>.
+gender_words=0
+
+[main_menu]
+; Custom version string shown on the main menu. Supports up to two %d placeholders for the game version numbers.
+; Example: FALLOUT II v1.02d
+version_string=
+; Font color for the version string and copyright text. Last byte picks the color (default 0x3C).
+; First byte flags: 1 - version string only, 2 - underline, 4 - monospace font.
+; Example: 0x000055
+font_color=0
+; Font color for the main menu button text.
+big_font_color=0
+; Pixel offset for main menu buttons.
+offset_x=0
+offset_y=0
+; Pixel offset for the copyright text line.
+credits_offset_x=0
+credits_offset_y=0
+
+[movies]
+; Number of days after game start when each Hakunin dream sequence becomes available.
+artimer1=90
+artimer2=180
+artimer3=270
+artimer4=360
+
+[combat]
+; Damage formula used to calculate combat damage.
+; 0 - Fallout default, 1 - Glovz's Damage Fix, 2 - Glovz's Damage Fix with Damage Multiplier tweak, 5 - Haenlomal's Yet Another Ammo Mod
+; Don't change this unless another mod explicitly requires it.
+damage_formula=0
+; Set to 1 to fix the bug that caused bonus HtH damage to not be applied correctly.
+bonus_hth_damage_fix=1
+; Set to 1 to remove the time limits that prevent critical hits/misses in the first few days of the game.
+remove_critical_time_limits=0
+; Set to 1 to allow science and repair to be used on the player, or 2 for all critters (rather than only brahmin/robots).
+science_on_critters=0
+; Set to 1 to enable modified burst bullet distribution (spray mod).
+burst_enabled=0
+; Ratio of bullets going to the center group vs. left/right in burst attacks. Multiplier is capped at divisor.
+burst_center_mult=1
+burst_center_div=3
+; Ratio of center-group bullets that target the primary target directly. Multiplier is capped at divisor.
+burst_target_mult=1
+burst_target_div=2
+
+[explosions]
+; Set to 1 to make explosions and projectiles emit light.
+emit_light=0
+; Dynamite damage range. Max is capped at 9999; min is capped at max.
+dynamite_max=50
+dynamite_min=30
+; Plastic explosive damage range. Max is capped at 9999; min is capped at max.
+plastic_explosive_max=80
+plastic_explosive_min=40
+
+[skilldex]
+; FRM numbers for Skilldex skill cursors. Default is 293 for all skills.
+lockpick=293
+steal=293
+traps=293
+first_aid=293
+doctor=293
+science=293
+repair=293
+
+[worldmap]
+; Set to 1 to prevent using number keys to enter unvisited areas on a town map.
+town_map_hotkeys_fix=1
+; Set to 1 to show travel markers on the world map, or 2 to show only when sneaking.
+trail_markers=0
+; Set to 1 to skip the encounter with Frank Horrigan.
+disable_horrigan=0
+; City reputation overrides. Syntax: city_id:global_id pairs separated by commas.
+; Example: 0:5001,2:5003,3:5004
+city_reputation_list=
+
+[characters]
+; Custom premade characters for the character selection screen.
+; premade_paths is a comma-separated list of file names (max 11 chars each) in the premade\ folder, without extension.
+; premade_fids is a comma-separated list of FRM numbers for the character portrait, matching the order of premade_paths.
+; Example: premade_paths=combat,diplomat,stealth   premade_fids=201,203,202
+premade_paths=
+premade_fids=
+
+[text]
+; Comma-separated list of extra game message file names (without .msg extension) to load from the game\ folder.
+; Use 'filename:number' syntax to assign explicit IDs. Access via message_str_game script function.
+extra_msg_file_list=

files/ddraw.ini

@@ -3,26 +3,9 @@
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Main]
 
-;Set to one to hide areas outside map bounds when using higher than 640x480 resolution, and to zero to disable
-;EnableHighResolutionStencil=1
-
-
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Misc]
 
-;Uncomment these lines to change the timers of how many days after the game starts Hakunin dream sequences will occur
-;MovieTimer_artimer1=5000
-;MovieTimer_artimer2=5000
-;MovieTimer_artimer3=5000
-;MovieTimer_artimer4=5000
-
-;To start a new game somewhere other than artemple.map, uncomment the next line and set it to the map you want to load
-;StartingMap=V13ent.map
-
-;To change the 'FALLOUT II v1.02d' version string on the main menu, uncomment the next line
-;You can use up to 2 %d's in this if you want to include Fallout's version number somewhere
-;VersionString=FALLOUT II v1.02d
-
 ;To use a config file other than fallout2.cfg, uncomment the next line and add the name of your new file
 ;ConfigFile=
 
@@ -30,40 +13,6 @@
 ;If you want to load multiple patch files (up to 1000) at once, you can include a %d in the file name (sprintf syntax)
 ;PatchFile=patch%03d.dat
 
-;Set to 1 to allow using the caret character '^' in dialog msg files to specify alternative text in dialogue based on the player's gender
-;The text must be enclosed in angle brackets (example: <MaleText^FemaleText>)
-;DialogGenderWords=0
-
-;To change the default and starting player models, uncomment the next four lines.
-;The default models can also be changed in-game via script
-;MaleStartModel=hmjmps
-;MaleDefaultModel=hmjmps
-;FemaleStartModel=hfjmps
-;FemaleDefaultModel=hfjmps
-
-;To change the starting year, month or day, uncomment the next 3 lines
-;Both StartMonth and StartDay are 0-indexed (i.e. 0 is January or the first day of a month)
-;StartYear=2241
-;StartMonth=01
-;StartDay=01
-
-;Set to 1 if you want the pipboy to be available at the start of the game
-;Set to 2 to make the pipboy available by only skipping the vault suit movie check
-;PipBoyAvailableAtGameStart=1
-
-;Choose the damage formula used to calculate combat damage.
-;Don't set this to anything other than 0 unless another mod you're using explicitly tells you to!
-;0 - Fallout default
-;1 - Glovz's Damage Fix
-;2 - Glovz's Damage Fix with Damage Multiplier tweak
-;5 - Haenlomal's Yet Another Ammo Mod
-;DamageFormula=0
-
-;Prevents you from using 0 to escape from dialogue at any time.
-;DialogueFix=1
-
-;Prevents you from using number keys to enter unvisited areas on a town map
-TownMapHotkeysFix=1
 
 ;Set to 1 to use a CriticalOverrides.ini file to override the default critical table
 ;Set to 2 to use the default critical with bug fixes (doesn't require an ini)
@@ -71,108 +20,9 @@ TownMapHotkeysFix=1
 ;If the ExtraKillTypes option is enabled, this should be set to 3, with containing entries for any new types
 ;Must be non-zero to use the edit/get/reset_critical script functions
 ;OverrideCriticalTable=2
-
-;Set to 1 to get notification of karma changes in the notification window
-DisplayKarmaChanges=0
-
-;Set to 1 to skip the 3 opening movies
-;Set to 2 to also skip the splash screen
-SkipOpeningMovies=0
-
-;Change the Skilldex cursor FRM numbers
-;Default is 293 for all skills
-Lockpick=293
-Steal=293
-Traps=293
-FirstAid=293
-Doctor=293
-Science=293
-Repair=293
-
-;Uncomment these lines to control the premade characters offered when starting a new game
-;Multiple options should be separated by commas, and there must be the same number of entries in both lines
-;Each name in PremadePaths is limited to 11 characters
-;PremadePaths=combat,diplomat,stealth
-;PremadeFIDs=201,203,202
-
-;Use this line to modify the list of cities and their associated global variables used for city reputations
-;Syntax is 'city id:global id', with each city/global pair separated by a comma.
-;CityRepsList=0:5001,2:5003,3:5004,4:5005,5:5006,6:5007,7:5008,8:5009,10:5011,11:5012,60:1640
-
-;Set this to a valid path to save a copy of the console contents
-;ConsoleOutputPath=console.txt
-
 ;Set to 1 to add additional pages of save slots !!! can be implemented !!!
 ;ExtraSaveSlots=1
 
-;To use more than one save slot for quick saving (F6 key) without picking a slot beforehand, set the next two lines
-;Quick save will cyclically overwrite saves from the first slot on the specified page to the last slot on the n-th page
-;AutoQuickSave sets how many pages you want to use for quick saving (valid range: 1..10)
-;Set to 0 to disable
-AutoQuickSave=0
-
-;These lines allow you to control the karma FRMs displayed on the character screen
-;Number of KarmaPoints should be 1 less than number of KarmaFRMs
-;KarmaFRMs=47,48,49
-;KarmaPoints=-100,100
-
-;Set to 1 to allow science and repair to be used on the player, or 2 for all critters. (Rather than only brahmin/robots)
-ScienceOnCritters=0
-
-;Set to 1 to fix the bug that caused bonus HtH damage to not be applied correctly.
-BonusHtHDamageFix=1
-
-;Set to 1 to display additional points of damage from Bonus HtH/Ranged Damage perks in the inventory
-;DisplayBonusDamage=1
-
-;Set to 1 to remove the limits that stop the game from rolling critical successes/failures in the first few days of game time
-RemoveCriticalTimelimits=0
-
-;Change the colour of the font used on the main menu for the Fallout/sfall version string and copyright text
-;It's the last byte ('3C' by default) that picks the colour used. The first byte supplies additional flags for this option
-;1 - change the colour for the version string only
-;2 - underline text for the version string
-;4 - use monospace font for the version string
-;MainMenuFontColour=0x000055
-;Change the colour of the font used on the main menu for the button text
-;MainMenuBigFontColour=0x3C
-
-;Uncomment the next four lines to move the main menu buttons and credit text (the 'Copyright(c)' line on the main menu)
-;MainMenuOffsetX=392
-;MainMenuOffsetY=26
-;MainMenuCreditsOffsetX=0
-;MainMenuCreditsOffsetY=0
-
-;These options modify the bullet distribution of burst attacks
-;All the bullets are divided into three groups: center, left, and right
-;These groups will then travel along three parallel tracks, trying to hit targets on the way
-;CenterMult/Div set the ratio of how many bullets go to the center group, and the remaining are divided equally to the left and right sides
-;TargetMult/Div set the ratio of how many bullets in the center group will attack the primary target directly
-;Multiplier values are capped at divisor values
-;ComputeSpray_CenterMult=1
-;ComputeSpray_CenterDiv=3
-;ComputeSpray_TargetMult=1
-;ComputeSpray_TargetDiv=2
-
-;Set to 1 to make explosions and projectiles emit light
-;ExplosionsEmitLight=1
-
-;Uncomment these lines to change explosives damage. DmgMax can be set to 9999 at max, and DmgMin is capped at DmgMax
-;Dynamite_DmgMax=50
-;Dynamite_DmgMin=30
-;PlasticExplosive_DmgMax=80
-;PlasticExplosive_DmgMin=40
-
-;To add additional game msg files, uncomment the next line and set a comma delimited list of filenames without .msg extension
-;By default, the files will have consecutive numbers assigned beginning with 0
-;You can use the syntax 'filename:number' to manually assign numbers to specific msg files, with each pair separated by a comma
-;If a file after the specified pair does not have a number assigned, it will have the next consecutive number from the last pair
-;You need to use the message_str_game script function to get messages from the files
-;ExtraGameMsgFileList=
-
-;Set to 1 to display numbered dialogue options
-NumbersInDialogue=0
-
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 ; Configuration ini files
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -191,17 +41,9 @@ NumbersInDialogue=0
 ;See the Unarmed.ini in the modders pack for an example file
 ;UnarmedFile=sfall\Unarmed.ini
 
-;To change some engine parameters for the game mechanics, uncomment the next line
-;TweaksFile=sfall\Tweaks.ini
-
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Scripts]
 
-;Comma-separated list of masked paths to load global scripts from
-;Only use single backslash \ as the directory separator
-;Paths outside of scripts folder are supported
-;GlobalScriptPaths=scripts\gl_*.int,scripts\sfall\gl*.int
-
 ;Uncomment the option to specify an additional directory for ini files used by scripts
 ;The game will search for ini files first relative to this directory and then relative to the root directory if not found
 ;The path length is limited to 61 characters

files/fallout2.cfg

@@ -0,0 +1,117 @@
+[debug]
+;Set this to a valid path to save a copy of the console contents
+console_output_path=
+mode=log
+output_map_data_info=1
+show_load_info=1
+show_script_messages=1
+show_tile_num=1
+window_height=192
+window_width=300
+
+[mapper]
+default_f8_as_game=1
+fix_map_inventory=0
+fix_map_objects=0
+ignore_rebuild_errors=0
+librarian=0
+override_librarian=0
+rebuild_protos=0
+run_mapper_as_game=0
+save_text_maps=0
+show_pid_numbers=0
+sort_script_list=0
+use_art_not_protos=0
+
+[preferences]
+brightness=1.000000
+combat_difficulty=1
+combat_looks=1
+combat_messages=1
+combat_speed=50
+combat_taunts=1
+game_difficulty=1
+item_highlight=1
+language_filter=0
+mouse_sensitivity=1.000000
+player_speedup=0
+running=1
+running_burning_guy=1
+subtitles=1
+target_highlight=1
+text_base_delay=6.000000
+text_line_delay=2.000000
+violence_level=3
+
+[screen]
+resolution_x=640
+resolution_y=480
+scale=1
+windowed=1
+
+[sound]
+cache_size=448
+debug=1
+debug_sfxc=1
+gapless_music=1
+initialize=1
+master_volume=22281
+music=1
+music_path1=data\sound\music\
+music_path2=sound\music\
+music_volume=22281
+sndfx_volume=22281
+sounds=1
+speech=1
+speech_volume=22281
+
+[system]
+art_cache_size=8
+color_cycling=1
+critter_dat=critter.dat
+critter_patches=data
+cycle_speed_factor=1
+executable=game
+free_space=20480
+hashing=1
+interrupt_walk=1
+language=english
+master_dat=master.dat
+master_patches=data
+screenshots_format=png
+scroll_lock=0
+splash=5
+
+[ui]
+;Speed up or slow down all UI animations such as screen fade, dialog window show/hide, AC numbers roll, etc.
+anim_speed=2.000000
+;To use more than one save slot for quick saving (F6 key) without picking a slot beforehand
+;Quick save will cyclically overwrite saves from the first slot on the specified page to the last slot on the n-th page
+;auto_quick_save sets how many pages you want to use for quick saving (valid range: 1..10)
+;Set to 0 to disable
+auto_quick_save=3
+;Set to 1 to display additional points of damage from Bonus HtH/Ranged Damage perks in the inventory
+display_bonus_damage=1
+;Set to 1 to get notification of karma changes in the notification window
+display_karma_changes=0
+;Set to one to hide areas outside map bounds when using higher than 640x480 resolution, and to zero to disable
+enable_high_resolution_stencil=1
+;Set to 1 to extend the action points bar to show up to 16 AP instead of 10 (requires iface_apbar_e.frm)
+extend_ap_bar=0
+iface_bar_mode=0
+iface_bar_side_art=2
+iface_bar_sides_ori=0
+iface_bar_width=800
+ignore_map_edges=0
+;Set to 1 to display numbered dialogue options
+numbers_in_dialogue=0
+;Set to 1 to skip the 3 opening movies
+;Set to 2 to also skip the splash screen
+skip_opening_movies=0
+splash_screen_size=1
+
+[qol]
+; Automatically open doors that are unlocked and has no script attached.
+auto_open_doors=0
+; Overrides distance at which walk animation is used when using an object.
+use_walk_distance=5

os/android/app/build.gradle

@@ -2,12 +2,97 @@ plugins {
     id 'com.android.application'
 }
 
+def sdlJavaBindingsDir = file('src/main/java/org/libsdl/app')
+
+def findFetchedSdlJavaBindingsDir = { String variantName ->
+    String variantCap = variantName.capitalize()
+    File intermediatesVariantDir = file("build/intermediates/cxx/${variantCap}")
+    if (!intermediatesVariantDir.isDirectory()) {
+        throw new GradleException("SDL sync check failed: missing active CXX intermediates under ${intermediatesVariantDir}. Run externalNativeBuild${variantCap} first.")
+    }
+
+    File[] activeHashDirs = intermediatesVariantDir.listFiles()
+    if (activeHashDirs == null) {
+        throw new GradleException("SDL sync check failed: could not list active CXX intermediates under ${intermediatesVariantDir}.")
+    }
+
+    activeHashDirs = activeHashDirs.findAll { it.isDirectory() }.sort { a, b -> a.name <=> b.name }
+    if (activeHashDirs.size() != 1) {
+        throw new GradleException(
+            "SDL sync check failed: expected exactly one active CXX hash directory under ${intermediatesVariantDir}, found ${activeHashDirs*.name}."
+        )
+    }
+
+    File fetchedDir = file(".cxx/${variantCap}/${activeHashDirs[0].name}/arm64-v8a/_deps/sdl2-src/android-project/app/src/main/java/org/libsdl/app")
+
+    if (!fetchedDir.isDirectory()) {
+        throw new GradleException("SDL sync check failed: could not locate fetched SDL Java bindings under ${fetchedDir}.")
+    }
+
+    return fetchedDir
+}
+
+def assertSdlJavaBindingsMatch = { String variantName ->
+    File fetchedDir = findFetchedSdlJavaBindingsDir(variantName)
+
+    if (!sdlJavaBindingsDir.isDirectory()) {
+        throw new GradleException("SDL sync check failed: committed SDL Java bindings directory is missing or unreadable: ${sdlJavaBindingsDir}.")
+    }
+
+    File[] committedFiles = sdlJavaBindingsDir.listFiles()
+    if (committedFiles == null) {
+        throw new GradleException("SDL sync check failed: could not list committed SDL Java bindings directory: ${sdlJavaBindingsDir}.")
+    }
+
+    File[] fetchedFiles = fetchedDir.listFiles()
+    if (fetchedFiles == null) {
+        throw new GradleException("SDL sync check failed: could not list fetched SDL Java bindings directory: ${fetchedDir}.")
+    }
+
+    Set<String> committedNames = committedFiles
+        .findAll { it.isFile() && it.name.endsWith('.java') }
+        .collect { it.name }
+        .toSet()
+    Set<String> fetchedNames = fetchedFiles
+        .findAll { it.isFile() && it.name.endsWith('.java') }
+        .collect { it.name }
+        .toSet()
+
+    Set<String> missingFromCommitted = fetchedNames - committedNames
+    Set<String> extraInCommitted = committedNames - fetchedNames
+
+    if (!missingFromCommitted.isEmpty() || !extraInCommitted.isEmpty()) {
+        throw new GradleException(
+            "SDL Android Java bindings are out of sync with native SDL for ${variantName}.\n" +
+            "Fetched SDL dir: ${fetchedDir}\n" +
+            "Missing from committed bindings: ${missingFromCommitted.sort()}\n" +
+            "Extra committed bindings: ${extraInCommitted.sort()}\n" +
+            "Sync os/android/app/src/main/java/org/libsdl/app from the fetched SDL android-project sources."
+        )
+    }
+
+    List<String> changedFiles = committedNames.findAll { fileName ->
+        File committedFile = new File(sdlJavaBindingsDir, fileName)
+        File fetchedFile = new File(fetchedDir, fileName)
+        committedFile.getText('UTF-8') != fetchedFile.getText('UTF-8')
+    }.sort()
+
+    if (!changedFiles.isEmpty()) {
+        throw new GradleException(
+            "SDL Android Java bindings are out of sync with native SDL for ${variantName}.\n" +
+            "Fetched SDL dir: ${fetchedDir}\n" +
+            "Changed files: ${changedFiles}\n" +
+            "Sync os/android/app/src/main/java/org/libsdl/app from the fetched SDL android-project sources."
+        )
+    }
+}
+
 android {
     compileSdk 32
 
     defaultConfig {
         applicationId 'com.alexbatalov.fallout2ce'
-        minSdk 21
+        minSdk 24
         targetSdk 32
         versionCode 4
         versionName '1.3.0'
@@ -78,8 +163,20 @@ android {
     }
 
     applicationVariants.all { variant ->
-        tasks["merge${variant.name.capitalize()}Assets"]
-            .dependsOn("externalNativeBuild${variant.name.capitalize()}")
+        String variantCap = variant.name.capitalize()
+        String syncCheckTaskName = "checkSdlJavaBindingsSync${variantCap}"
+
+        if (!project.hasProperty('EXCLUDE_NATIVE_LIBS')) {
+            tasks.register(syncCheckTaskName) {
+                dependsOn("externalNativeBuild${variantCap}")
+                doLast {
+                    assertSdlJavaBindingsMatch(variant.name)
+                }
+            }
+
+            tasks["merge${variantCap}Assets"]
+                .dependsOn(syncCheckTaskName)
+        }
     }
 
     if (!project.hasProperty('EXCLUDE_NATIVE_LIBS')) {

os/android/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java

@@ -186,7 +186,7 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
     // Because on Chromebooks we show up as a dual-mode device, it will attempt to connect TRANSPORT_AUTO, which will use TRANSPORT_BREDR instead
     // of TRANSPORT_LE.  Let's force ourselves to connect low energy.
     private BluetoothGatt connectGatt(boolean managed) {
-        if (Build.VERSION.SDK_INT >= 23) {
+        if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
             try {
                 return mDevice.connectGatt(mManager.getContext(), managed, this, TRANSPORT_LE);
             } catch (Exception e) {
@@ -429,7 +429,7 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
                     }
                 });
             }
-        } 
+        }
         else if (newState == 0) {
             mIsConnected = false;
         }

os/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java

@@ -170,7 +170,7 @@ public class HIDDeviceManager {
                 Log.i(TAG,"  Interface protocol: " + mUsbInterface.getInterfaceProtocol());
                 Log.i(TAG,"  Endpoint count: " + mUsbInterface.getEndpointCount());
 
-                // Get endpoint details 
+                // Get endpoint details
                 for (int epi = 0; epi < mUsbInterface.getEndpointCount(); epi++)
                 {
                     UsbEndpoint mEndpoint = mUsbInterface.getEndpoint(epi);
@@ -251,6 +251,8 @@ public class HIDDeviceManager {
             0x20d6, // PowerA
             0x24c6, // PowerA
             0x2c22, // Qanba
+            0x2dc8, // 8BitDo
+            0x9886, // ASTRO Gaming
         };
 
         if (usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
@@ -271,15 +273,20 @@ public class HIDDeviceManager {
         final int XB1_IFACE_SUBCLASS = 71;
         final int XB1_IFACE_PROTOCOL = 208;
         final int[] SUPPORTED_VENDORS = {
+            0x03f0, // HP
+            0x044f, // Thrustmaster
             0x045e, // Microsoft
             0x0738, // Mad Catz
+            0x0b05, // ASUS
             0x0e6f, // PDP
             0x0f0d, // Hori
+            0x10f5, // Turtle Beach
             0x1532, // Razer Wildcat
             0x20d6, // PowerA
             0x24c6, // PowerA
-            0x2dc8, /* 8BitDo */
+            0x2dc8, // 8BitDo
             0x2e24, // Hyperkin
+            0x3537, // GameSir
         };
 
         if (usbInterface.getId() == 0 &&
@@ -353,13 +360,19 @@ public class HIDDeviceManager {
     private void initializeBluetooth() {
         Log.d(TAG, "Initializing Bluetooth");
 
-        if (Build.VERSION.SDK_INT <= 30 &&
+        if (Build.VERSION.SDK_INT >= 31 /* Android 12  */ &&
+            mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH_CONNECT, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH_CONNECT");
+            return;
+        }
+
+        if (Build.VERSION.SDK_INT <= 30 /* Android 11.0 (R) */ &&
             mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
             Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH");
             return;
         }
 
-        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE) || (Build.VERSION.SDK_INT < 18)) {
+        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE) || (Build.VERSION.SDK_INT < 18 /* Android 4.3 (JELLY_BEAN_MR2) */)) {
             Log.d(TAG, "Couldn't initialize Bluetooth, this version of Android does not support Bluetooth LE");
             return;
         }
@@ -524,7 +537,7 @@ public class HIDDeviceManager {
             for (HIDDevice device : mDevicesById.values()) {
                 device.setFrozen(frozen);
             }
-        }        
+        }
     }
 
     //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -573,12 +586,18 @@ public class HIDDeviceManager {
             try {
                 final int FLAG_MUTABLE = 0x02000000; // PendingIntent.FLAG_MUTABLE, but don't require SDK 31
                 int flags;
-                if (Build.VERSION.SDK_INT >= 31) {
+                if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
                     flags = FLAG_MUTABLE;
                 } else {
                     flags = 0;
                 }
-                mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
+                if (Build.VERSION.SDK_INT >= 33 /* Android 14.0 (U) */) {
+                   Intent intent = new Intent(HIDDeviceManager.ACTION_USB_PERMISSION);
+                   intent.setPackage(mContext.getPackageName());
+                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, intent, flags));
+               } else {
+                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
+               }
             } catch (Exception e) {
                 Log.v(TAG, "Couldn't request permission for USB device " + usbDevice);
                 HIDDeviceOpenResult(deviceID, false);

os/android/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java

@@ -52,7 +52,7 @@ class HIDDeviceUSB implements HIDDevice {
     @Override
     public String getSerialNumber() {
         String result = null;
-        if (Build.VERSION.SDK_INT >= 21) {
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
             try {
                 result = mDevice.getSerialNumber();
             }
@@ -74,7 +74,7 @@ class HIDDeviceUSB implements HIDDevice {
     @Override
     public String getManufacturerName() {
         String result = null;
-        if (Build.VERSION.SDK_INT >= 21) {
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
             result = mDevice.getManufacturerName();
         }
         if (result == null) {
@@ -86,7 +86,7 @@ class HIDDeviceUSB implements HIDDevice {
     @Override
     public String getProductName() {
         String result = null;
-        if (Build.VERSION.SDK_INT >= 21) {
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
             result = mDevice.getProductName();
         }
         if (result == null) {

os/android/app/src/main/java/org/libsdl/app/SDL.java

@@ -29,6 +29,7 @@ public class SDL {
 
     // This function stores the current activity (SDL or not)
     public static void setContext(Context context) {
+        SDLAudioManager.setContext(context);
         mContext = context;
     }
 
@@ -37,6 +38,10 @@ public class SDL {
     }
 
     public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
+        loadLibrary(libraryName, mContext);
+    }
+
+    public static void loadLibrary(String libraryName, Context context) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
 
         if (libraryName == null) {
             throw new NullPointerException("No library name provided.");
@@ -52,10 +57,10 @@ public class SDL {
             // To use ReLinker, just add it as a dependency.  For more information, see 
             // https://github.com/KeepSafe/ReLinker for ReLinker's repository.
             //
-            Class<?> relinkClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
-            Class<?> relinkListenerClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
-            Class<?> contextClass = mContext.getClassLoader().loadClass("android.content.Context");
-            Class<?> stringClass = mContext.getClassLoader().loadClass("java.lang.String");
+            Class<?> relinkClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
+            Class<?> relinkListenerClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
+            Class<?> contextClass = context.getClassLoader().loadClass("android.content.Context");
+            Class<?> stringClass = context.getClassLoader().loadClass("java.lang.String");
 
             // Get a 'force' instance of the ReLinker, so we can ensure libraries are reinstalled if 
             // they've changed during updates.
@@ -65,7 +70,7 @@ public class SDL {
 
             // Actually load the library!
             Method loadMethod = relinkInstanceClass.getDeclaredMethod("loadLibrary", contextClass, stringClass, stringClass, relinkListenerClass);
-            loadMethod.invoke(relinkInstance, mContext, libraryName, null, null);
+            loadMethod.invoke(relinkInstance, context, libraryName, null, null);
         }
         catch (final Throwable e) {
             // Fall back

os/android/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -60,8 +60,8 @@ import java.util.Locale;
 public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 2;
-    private static final int SDL_MINOR_VERSION = 26;
-    private static final int SDL_MICRO_VERSION = 1;
+    private static final int SDL_MINOR_VERSION = 32;
+    private static final int SDL_MICRO_VERSION = 8;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
@@ -89,11 +89,11 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
                 | InputDevice.SOURCE_CLASS_POSITION
                 | InputDevice.SOURCE_CLASS_TRACKBALL);
 
-        if (s2 != 0) cls += "Some_Unkown";
+        if (s2 != 0) cls += "Some_Unknown";
 
         s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        if (Build.VERSION.SDK_INT >= 23) {
             tst = InputDevice.SOURCE_BLUETOOTH_STYLUS;
             if ((s & tst) == tst) src += " BLUETOOTH_STYLUS";
             s2 &= ~tst;
@@ -107,7 +107,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         if ((s & tst) == tst) src += " GAMEPAD";
         s2 &= ~tst;
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (Build.VERSION.SDK_INT >= 21) {
             tst = InputDevice.SOURCE_HDMI;
             if ((s & tst) == tst) src += " HDMI";
             s2 &= ~tst;
@@ -146,7 +146,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         if ((s & tst) == tst) src += " TOUCHSCREEN";
         s2 &= ~tst;
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+        if (Build.VERSION.SDK_INT >= 18) {
             tst = InputDevice.SOURCE_TOUCH_NAVIGATION;
             if ((s & tst) == tst) src += " TOUCH_NAVIGATION";
             s2 &= ~tst;
@@ -163,14 +163,14 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         if (s == FLAG_TAINTED) src += " FLAG_TAINTED";
         s2 &= ~FLAG_TAINTED;
 
-        if (s2 != 0) src += " Some_Unkown";
+        if (s2 != 0) src += " Some_Unknown";
 
         Log.v(TAG, prefix + "int=" + s_copy + " CLASS={" + cls + " } source(s):" + src);
     }
 */
 
     public static boolean mIsResumedCalled, mHasFocus;
-    public static final boolean mHasMultiWindow = (Build.VERSION.SDK_INT >= 24);
+    public static final boolean mHasMultiWindow = (Build.VERSION.SDK_INT >= 24  /* Android 7.0 (N) */);
 
     // Cursor types
     // private static final int SDL_SYSTEM_CURSOR_NONE = -1;
@@ -224,9 +224,9 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
 
     protected static SDLGenericMotionListener_API12 getMotionListener() {
         if (mMotionListener == null) {
-            if (Build.VERSION.SDK_INT >= 26) {
+            if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) {
                 mMotionListener = new SDLGenericMotionListener_API26();
-            } else if (Build.VERSION.SDK_INT >= 24) {
+            } else if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
                 mMotionListener = new SDLGenericMotionListener_API24();
             } else {
                 mMotionListener = new SDLGenericMotionListener_API12();
@@ -281,7 +281,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     // Load the .so
     public void loadLibraries() {
        for (String lib : getLibraries()) {
-          SDL.loadLibrary(lib);
+          SDL.loadLibrary(lib, this);
        }
     }
 
@@ -393,7 +393,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         mHIDDeviceManager = HIDDeviceManager.acquire(this);
 
         // Set up the surface
-        mSurface = createSDLSurface(getApplication());
+        mSurface = createSDLSurface(this);
 
         mLayout = new RelativeLayout(this);
         mLayout.addView(mSurface);
@@ -404,7 +404,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         SDLActivity.onNativeOrientationChanged(mCurrentOrientation);
 
         try {
-            if (Build.VERSION.SDK_INT < 24) {
+            if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
                 mCurrentLocale = getContext().getResources().getConfiguration().locale;
             } else {
                 mCurrentLocale = getContext().getResources().getConfiguration().getLocales().get(0);
@@ -588,6 +588,8 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
             mHIDDeviceManager = null;
         }
 
+        SDLAudioManager.release(this);
+
         if (SDLActivity.mBrokenLibraries) {
            super.onDestroy();
            return;
@@ -766,7 +768,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
                 }
                 break;
             case COMMAND_CHANGE_WINDOW_STYLE:
-                if (Build.VERSION.SDK_INT >= 19) {
+                if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
                     if (context instanceof Activity) {
                         Window window = ((Activity) context).getWindow();
                         if (window != null) {
@@ -788,6 +790,9 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
                                 window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
                                 SDLActivity.mFullscreenModeActive = false;
                             }
+                            if (Build.VERSION.SDK_INT >= 28 /* Android 9 (Pie) */) {
+                                window.getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+                            }
                         }
                     } else {
                         Log.e(TAG, "error handling message, getContext() returned no Activity");
@@ -841,7 +846,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         msg.obj = data;
         boolean result = commandHandler.sendMessage(msg);
 
-        if (Build.VERSION.SDK_INT >= 19) {
+        if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
             if (command == COMMAND_CHANGE_WINDOW_STYLE) {
                 // Ensure we don't return until the resize has actually happened,
                 // or 500ms have passed.
@@ -969,15 +974,18 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         /* If set, hint "explicitly controls which UI orientations are allowed". */
         if (hint.contains("LandscapeRight") && hint.contains("LandscapeLeft")) {
             orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
-        } else if (hint.contains("LandscapeRight")) {
-            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
         } else if (hint.contains("LandscapeLeft")) {
+            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+        } else if (hint.contains("LandscapeRight")) {
             orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
         }
 
-        if (hint.contains("Portrait") && hint.contains("PortraitUpsideDown")) {
+        /* exact match to 'Portrait' to distinguish with PortraitUpsideDown */
+        boolean contains_Portrait = hint.contains("Portrait ") || hint.endsWith("Portrait");
+
+        if (contains_Portrait && hint.contains("PortraitUpsideDown")) {
             orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
-        } else if (hint.contains("Portrait")) {
+        } else if (contains_Portrait) {
             orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
         } else if (hint.contains("PortraitUpsideDown")) {
             orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
@@ -990,8 +998,8 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         /* No valid hint, nothing is explicitly allowed */
         if (!is_portrait_allowed && !is_landscape_allowed) {
             if (resizable) {
-                /* All orientations are allowed */
-                req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
+                /* All orientations are allowed, respecting user orientation lock setting */
+                req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
             } else {
                 /* Fixed window and nothing specified. Get orientation from w/h of created window */
                 req = (w > h ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
@@ -1000,8 +1008,8 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
             /* At least one orientation is allowed */
             if (resizable) {
                 if (is_portrait_allowed && is_landscape_allowed) {
-                    /* hint allows both landscape and portrait, promote to full sensor */
-                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
+                    /* hint allows both landscape and portrait, promote to full user */
+                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
                 } else {
                     /* Use the only one allowed "orientation" */
                     req = (is_landscape_allowed ? orientation_landscape : orientation_portrait);
@@ -1090,7 +1098,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         // thus SDK version 27.  If we are in DeX mode and not API 27 or higher, as a result,
         // we should stick to relative mode.
         //
-        if ((Build.VERSION.SDK_INT < 27) && isDeXMode()) {
+        if (Build.VERSION.SDK_INT < 27 /* Android 8.1 (O_MR1) */ && isDeXMode()) {
             return false;
         }
 
@@ -1180,7 +1188,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
      * This method is called by SDL using JNI.
      */
     public static boolean isDeXMode() {
-        if (Build.VERSION.SDK_INT < 24) {
+        if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
             return false;
         }
         try {
@@ -1340,23 +1348,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
             }
         }
 
-        if ((source & InputDevice.SOURCE_KEYBOARD) == InputDevice.SOURCE_KEYBOARD) {
-            if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                if (isTextInputEvent(event)) {
-                    if (ic != null) {
-                        ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
-                    } else {
-                        SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1);
-                    }
-                }
-                onNativeKeyDown(keyCode);
-                return true;
-            } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                onNativeKeyUp(keyCode);
-                return true;
-            }
-        }
-
         if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
             // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
             // they are ignored here because sending them as mouse input to SDL is messy
@@ -1371,6 +1362,21 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
             }
         }
 
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            if (isTextInputEvent(event)) {
+                if (ic != null) {
+                    ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+                } else {
+                    SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1);
+                }
+            }
+            onNativeKeyDown(keyCode);
+            return true;
+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+            onNativeKeyUp(keyCode);
+            return true;
+        }
+
         return false;
     }
 
@@ -1617,7 +1623,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     private final Runnable rehideSystemUi = new Runnable() {
         @Override
         public void run() {
-            if (Build.VERSION.SDK_INT >= 19) {
+            if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
                 int flags = View.SYSTEM_UI_FLAG_FULLSCREEN |
                         View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
                         View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
@@ -1670,7 +1676,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         Bitmap bitmap = Bitmap.createBitmap(colors, width, height, Bitmap.Config.ARGB_8888);
         ++mLastCursorID;
 
-        if (Build.VERSION.SDK_INT >= 24) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
             try {
                 mCursors.put(mLastCursorID, PointerIcon.create(bitmap, hotSpotX, hotSpotY));
             } catch (Exception e) {
@@ -1686,7 +1692,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
      * This method is called by SDL using JNI.
      */
     public static void destroyCustomCursor(int cursorID) {
-        if (Build.VERSION.SDK_INT >= 24) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
             try {
                 mCursors.remove(cursorID);
             } catch (Exception e) {
@@ -1700,7 +1706,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
      */
     public static boolean setCustomCursor(int cursorID) {
 
-        if (Build.VERSION.SDK_INT >= 24) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
             try {
                 mSurface.setPointerIcon(mCursors.get(cursorID));
             } catch (Exception e) {
@@ -1755,7 +1761,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
             cursor_type = 1002; //PointerIcon.TYPE_HAND;
             break;
         }
-        if (Build.VERSION.SDK_INT >= 24) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
             try {
                 mSurface.setPointerIcon(PointerIcon.getSystemIcon(SDL.getContext(), cursor_type));
             } catch (Exception e) {
@@ -1769,7 +1775,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
      * This method is called by SDL using JNI.
      */
     public static void requestPermission(String permission, int requestCode) {
-        if (Build.VERSION.SDK_INT < 23) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
             nativePermissionResult(requestCode, true);
             return;
         }
@@ -1798,7 +1804,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
             i.setData(Uri.parse(url));
 
             int flags = Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
-            if (Build.VERSION.SDK_INT >= 21) {
+            if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
                 flags |= Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
             } else {
                 flags |= Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET;
@@ -2002,6 +2008,18 @@ class SDLInputConnection extends BaseInputConnection {
 
     @Override
     public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        if (Build.VERSION.SDK_INT <= 29 /* Android 10.0 (Q) */) {
+            // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions>/14560344/android-backspace-in-webview-baseinputconnection
+            // and https://bugzilla.libsdl.org/show_bug.cgi?id=2265
+            if (beforeLength > 0 && afterLength == 0) {
+                // backspace(s)
+                while (beforeLength-- > 0) {
+                    nativeGenerateScancodeForUnichar('\b');
+                }
+                return true;
+           }
+        }
+
         if (!super.deleteSurroundingText(beforeLength, afterLength)) {
             return false;
         }

os/android/app/src/main/java/org/libsdl/app/SDLAudioManager.java

@@ -1,5 +1,8 @@
 package org.libsdl.app;
 
+import android.content.Context;
+import android.media.AudioDeviceCallback;
+import android.media.AudioDeviceInfo;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioRecord;
@@ -8,34 +11,67 @@ import android.media.MediaRecorder;
 import android.os.Build;
 import android.util.Log;
 
-public class SDLAudioManager
-{
+import java.util.Arrays;
+
+public class SDLAudioManager {
     protected static final String TAG = "SDLAudio";
 
     protected static AudioTrack mAudioTrack;
     protected static AudioRecord mAudioRecord;
+    protected static Context mContext;
+
+    private static final int[] NO_DEVICES = {};
+
+    private static AudioDeviceCallback mAudioDeviceCallback;
 
     public static void initialize() {
         mAudioTrack = null;
         mAudioRecord = null;
+        mAudioDeviceCallback = null;
+
+        if(Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */)
+        {
+            mAudioDeviceCallback = new AudioDeviceCallback() {
+                @Override
+                public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
+                    Arrays.stream(addedDevices).forEach(deviceInfo -> addAudioDevice(deviceInfo.isSink(), deviceInfo.getId()));
+                }
+
+                @Override
+                public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) {
+                    Arrays.stream(removedDevices).forEach(deviceInfo -> removeAudioDevice(deviceInfo.isSink(), deviceInfo.getId()));
+                }
+            };
+        }
+    }
+
+    public static void setContext(Context context) {
+        mContext = context;
+        if (context != null) {
+            registerAudioDeviceCallback();
+        }
+    }
+
+    public static void release(Context context) {
+        unregisterAudioDeviceCallback(context);
     }
 
     // Audio
 
     protected static String getAudioFormatString(int audioFormat) {
         switch (audioFormat) {
-        case AudioFormat.ENCODING_PCM_8BIT:
-            return "8-bit";
-        case AudioFormat.ENCODING_PCM_16BIT:
-            return "16-bit";
-        case AudioFormat.ENCODING_PCM_FLOAT:
-            return "float";
-        default:
-            return Integer.toString(audioFormat);
+            case AudioFormat.ENCODING_PCM_8BIT:
+                return "8-bit";
+            case AudioFormat.ENCODING_PCM_16BIT:
+                return "16-bit";
+            case AudioFormat.ENCODING_PCM_FLOAT:
+                return "float";
+            default:
+                return Integer.toString(audioFormat);
         }
     }
 
-    protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) {
+    protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
         int channelConfig;
         int sampleSize;
         int frameSize;
@@ -43,14 +79,14 @@ public class SDLAudioManager
         Log.v(TAG, "Opening " + (isCapture ? "capture" : "playback") + ", requested " + desiredFrames + " frames of " + desiredChannels + " channel " + getAudioFormatString(audioFormat) + " audio at " + sampleRate + " Hz");
 
         /* On older devices let's use known good settings */
-        if (Build.VERSION.SDK_INT < 21) {
+        if (Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) {
             if (desiredChannels > 2) {
                 desiredChannels = 2;
             }
         }
 
         /* AudioTrack has sample rate limitation of 48000 (fixed in 5.0.2) */
-        if (Build.VERSION.SDK_INT < 22) {
+        if (Build.VERSION.SDK_INT < 22 /* Android 5.1 (LOLLIPOP_MR1) */) {
             if (sampleRate < 8000) {
                 sampleRate = 8000;
             } else if (sampleRate > 48000) {
@@ -59,7 +95,7 @@ public class SDLAudioManager
         }
 
         if (audioFormat == AudioFormat.ENCODING_PCM_FLOAT) {
-            int minSDKVersion = (isCapture ? 23 : 21);
+            int minSDKVersion = (isCapture ? 23 /* Android 6.0 (M) */ : 21 /* Android 5.0 (LOLLIPOP) */);
             if (Build.VERSION.SDK_INT < minSDKVersion) {
                 audioFormat = AudioFormat.ENCODING_PCM_16BIT;
             }
@@ -120,7 +156,7 @@ public class SDLAudioManager
                 channelConfig = AudioFormat.CHANNEL_OUT_5POINT1 | AudioFormat.CHANNEL_OUT_BACK_CENTER;
                 break;
             case 8:
-                if (Build.VERSION.SDK_INT >= 23) {
+                if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
                     channelConfig = AudioFormat.CHANNEL_OUT_7POINT1_SURROUND;
                 } else {
                     Log.v(TAG, "Requested " + desiredChannels + " channels, getting 5.1 surround");
@@ -201,6 +237,10 @@ public class SDLAudioManager
                     return null;
                 }
 
+                if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) {
+                    mAudioRecord.setPreferredDevice(getOutputAudioDeviceInfo(deviceId));
+                }
+
                 mAudioRecord.startRecording();
             }
 
@@ -224,6 +264,10 @@ public class SDLAudioManager
                     return null;
                 }
 
+                if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) {
+                    mAudioTrack.setPreferredDevice(getInputAudioDeviceInfo(deviceId));
+                }
+
                 mAudioTrack.play();
             }
 
@@ -238,11 +282,73 @@ public class SDLAudioManager
         return results;
     }
 
+    private static AudioDeviceInfo getInputAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS))
+                    .filter(deviceInfo -> deviceInfo.getId() == deviceId)
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            return null;
+        }
+    }
+
+    private static AudioDeviceInfo getOutputAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS))
+                    .filter(deviceInfo -> deviceInfo.getId() == deviceId)
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            return null;
+        }
+    }
+
+    private static void registerAudioDeviceCallback() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.registerAudioDeviceCallback(mAudioDeviceCallback, null);
+        }
+    }
+
+    private static void unregisterAudioDeviceCallback(Context context) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.unregisterAudioDeviceCallback(mAudioDeviceCallback);
+        }
+    }
+
     /**
      * This method is called by SDL using JNI.
      */
-    public static int[] audioOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) {
-        return open(false, sampleRate, audioFormat, desiredChannels, desiredFrames);
+    public static int[] getAudioOutputDevices() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)).mapToInt(AudioDeviceInfo::getId).toArray();
+        } else {
+            return NO_DEVICES;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] getAudioInputDevices() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)).mapToInt(AudioDeviceInfo::getId).toArray();
+        } else {
+            return NO_DEVICES;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] audioOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        return open(false, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId);
     }
 
     /**
@@ -254,6 +360,11 @@ public class SDLAudioManager
             return;
         }
 
+        if (android.os.Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) {
+            Log.e(TAG, "Attempted to make an incompatible audio call with uninitialized audio! (floating-point output is supported since Android 5.0 Lollipop)");
+            return;
+        }
+
         for (int i = 0; i < buffer.length;) {
             int result = mAudioTrack.write(buffer, i, buffer.length - i, AudioTrack.WRITE_BLOCKING);
             if (result > 0) {
@@ -326,18 +437,22 @@ public class SDLAudioManager
     /**
      * This method is called by SDL using JNI.
      */
-    public static int[] captureOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) {
-        return open(true, sampleRate, audioFormat, desiredChannels, desiredFrames);
+    public static int[] captureOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        return open(true, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId);
     }
 
     /** This method is called by SDL using JNI. */
     public static int captureReadFloatBuffer(float[] buffer, boolean blocking) {
-        return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
+            return 0;
+        } else {
+            return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        }
     }
 
     /** This method is called by SDL using JNI. */
     public static int captureReadShortBuffer(short[] buffer, boolean blocking) {
-        if (Build.VERSION.SDK_INT < 23) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
             return mAudioRecord.read(buffer, 0, buffer.length);
         } else {
             return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
@@ -346,7 +461,7 @@ public class SDLAudioManager
 
     /** This method is called by SDL using JNI. */
     public static int captureReadByteBuffer(byte[] buffer, boolean blocking) {
-        if (Build.VERSION.SDK_INT < 23) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
             return mAudioRecord.read(buffer, 0, buffer.length);
         } else {
             return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
@@ -391,4 +506,9 @@ public class SDLAudioManager
     }
 
     public static native int nativeSetupJNI();
+
+    public static native void removeAudioDevice(boolean isCapture, int deviceId);
+
+    public static native void addAudioDevice(boolean isCapture, int deviceId);
+
 }