Merge branch 'main' into fallout2ce-dat

Merge pull request #215 from fallout2-ce/decrypt-win-refresh
Decryption of `_GNW_win_refresh`
2026-07-27 16:47:11 -07:00 · 2025-06-22 20:32:23 +09:00 · 2025-06-22 11:03:10 +09:00 · 2025-06-21 14:43:10 -07:00 · 2025-06-21 12:00:32 +09:00 · 2025-06-19 23:48:01 -07:00
101 changed files with 3487 additions and 499 deletions
@@ -89,6 +89,7 @@ jobs:
          folder: fallout2-ce-ems/dist
          target-folder: ${{ steps.set-path.outputs.DEST_DIR }}
          clean: false
+          single-commit: true

      - name: Comment preview URL on PR
        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
@@ -87,7 +87,7 @@ jobs:
        uses: actions/cache@v4
        with:
          path: os/android/app/.cxx
-          key: android-cmake-v2
+          key: android-cmake-v100

      - name: Setup signing config
        if: env.KEYSTORE_FILE_BASE64 != '' && env.KEYSTORE_PROPERTIES_FILE_BASE64 != ''
@@ -128,7 +128,7 @@ jobs:
        uses: actions/cache@v4
        with:
          path: out
-          key: ios-cmake-v5
+          key: ios-cmake-v100

      - name: Configure
        run: |
@@ -183,7 +183,7 @@ jobs:
        uses: actions/cache@v4
        with:
          path: out
-          key: linux-${{ matrix.arch }}-cmake-v3
+          key: linux-${{ matrix.arch }}-cmake-v100

      - name: Configure
        run: |
@@ -288,7 +288,7 @@ jobs:
        uses: actions/cache@v4
        with:
          path: out
-          key: macos-cmake-v6
+          key: macos-cmake-v100

      - name: Configure
        run: |
@@ -313,7 +313,7 @@ jobs:
  windows:
    name: Windows (${{ matrix.arch }})

-    runs-on: windows-2019
+    runs-on: windows-2025

    strategy:
      fail-fast: false
@@ -328,19 +328,28 @@ jobs:
      - name: Clone
        uses: actions/checkout@v4

+      - name: Install Visual Studio 2019 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'"
+
      - name: Cache cmake build
        uses: actions/cache@v4
        with:
          path: out
-          key: windows-${{ matrix.arch }}-cmake-v2
+          key: windows-${{ matrix.arch }}-cmake-v100

      - name: Configure
+        shell: cmd
        run: |
-          cmake --preset windows-${{ matrix.arch }}
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
+          && cmake --preset windows-${{ matrix.arch }}

      - name: Build
+        shell: cmd
        run: |
-          cmake --build --preset windows-${{ matrix.arch }}-release
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
+          && cmake --build --preset windows-${{ matrix.arch }}-release

      - name: Change executable file name
        run: |
@@ -29,5 +29,18 @@ jobs:
        run: |
          git config user.name "github-actions[bot]"
          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git commit -am "🚮 Remove preview for closed PR #${{ github.event.pull_request.number }}"
-          git push
+
+          CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+          echo "Current branch: $CURRENT_BRANCH"
+
+          if [ "$CURRENT_BRANCH" != "gh-pages" ]; then
+            echo "❌ Refusing to force-push to non-gh-pages branch: $CURRENT_BRANCH"
+            exit 1
+          fi
+
+          if git diff --cached --quiet; then
+            echo "No changes to commit"
+          else
+            git commit --amend -m "🚮 Remove preview for closed PR #${{ github.event.pull_request.number }}"
+            git push --force
+          fi
@@ -243,7 +243,7 @@ jobs:
  windows:
    name: Windows (${{ matrix.arch }})

-    runs-on: windows-2019
+    runs-on: windows-2025

    strategy:
      fail-fast: false
@@ -258,6 +258,11 @@ jobs:
      - name: Clone
        uses: actions/checkout@v4

+      - name: Install Visual Studio 2019 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'"
+
      - name: Cache cmake build
        uses: actions/cache@v4
        with:
@@ -265,19 +270,16 @@ jobs:
          key: windows-${{ matrix.arch }}-cmake-v1

      - name: Configure
+        shell: cmd
        run: |
-          cmake \
-            -B build \
-            -G "Visual Studio 16 2019" \
-            -A ${{ matrix.generator-platform }} \
-            # EOL
+          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 }}

      - name: Build
+        shell: cmd
        run: |
-          cmake \
-            --build build \
-            --config RelWithDebInfo \
-            # EOL
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
+          && cmake --build build --config RelWithDebInfo

      - name: Upload
        run: |
@@ -290,6 +290,7 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
    "src/sfall_arrays.h"
    "src/touch.cc"
    "src/touch.h"
+    "src/scan_unimplemented.cc"
 )

 if(IOS)
@@ -125,7 +125,7 @@ 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
+;IFACE_BAR_WIDTH=640
 ```

 Recommendations:
@@ -4,7 +4,8 @@
 [Main]

 ;Set to one to hide areas outside map bounds when using higher than 640x480 resolution, and to zero to disable
-;HiResMode=1
+;EnableHighResolutionStencil=1
+

 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Misc]
--- a/Show More
+++ b/Show More