Update inventory.cc

Added a comment regarding the button flaw on Inventory, Use On and Loot screens.

Also noted that scaling and flipping the main menu button is a temp solution/stop-gap measure.

.github/workflows/auto-format.yml

@@ -1,42 +0,0 @@
-name: Auto Format with Clang
-
-on: 
-  pull_request:
-    types: [opened, synchronize]
-  push:
-    branches: [main]
-
-jobs:
-  format:
-    runs-on: ubuntu-latest
-    if: github.actor != 'github-actions[bot]' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref || github.ref_name  }}
-          token: ${{ secrets.PAT_FOR_ACTIONS }}
-
-      - name: Run clang-format via Docker
-        run: |
-          docker run --rm \
-            -v ${{ github.workspace }}:/app --workdir /app  \
-            --user $(id -u):$(id -g) silkeh/clang:18 \
-            bash -c 'find src -type f \( -name "*.cc" -o -name "*.h" \) -print0 | xargs -0 clang-format -i'
-
-
-      # https://github.com/actions/checkout?tab=readme-ov-file#push-a-commit-to-a-pr-using-the-built-in-token
-      - name: Check and commit changes if needed
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-          if ! git diff --quiet; then
-            git diff
-            git commit -am "chore: auto-format with clang-format"
-            git push
-          else
-            echo "No formatting changes"
-          fi
-
-    

.github/workflows/ci-build-web.yml

@@ -89,7 +89,6 @@ 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

.github/workflows/ci-build.yml

@@ -87,7 +87,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: os/android/app/.cxx
-          key: android-cmake-v100
+          key: android-cmake-v2
 
       - 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-v100
+          key: ios-cmake-v5
 
       - name: Configure
         run: |
@@ -183,7 +183,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: out
-          key: linux-${{ matrix.arch }}-cmake-v100
+          key: linux-${{ matrix.arch }}-cmake-v3
 
       - name: Configure
         run: |
@@ -288,7 +288,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: out
-          key: macos-cmake-v100
+          key: macos-cmake-v6
 
       - name: Configure
         run: |
@@ -313,7 +313,7 @@ jobs:
   windows:
     name: Windows (${{ matrix.arch }})
 
-    runs-on: windows-2025
+    runs-on: windows-2019
 
     strategy:
       fail-fast: false
@@ -328,28 +328,19 @@ 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-v100
+          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 --preset windows-${{ matrix.arch }}
+          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 --preset windows-${{ matrix.arch }}-release
+          cmake --build --preset windows-${{ matrix.arch }}-release
 
       - name: Change executable file name
         run: |

.github/workflows/ci-delete-pr-preview.yml

@@ -29,18 +29,5 @@ jobs:
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-          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
+          git commit -am "🚮 Remove preview for closed PR #${{ github.event.pull_request.number }}"
+          git push

.github/workflows/release.yml

@@ -243,7 +243,7 @@ jobs:
   windows:
     name: Windows (${{ matrix.arch }})
 
-    runs-on: windows-2025
+    runs-on: windows-2019
 
     strategy:
       fail-fast: false
@@ -258,11 +258,6 @@ 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:
@@ -270,16 +265,19 @@ jobs:
           key: windows-${{ matrix.arch }}-cmake-v1
 
       - 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 }}
+          cmake \
+            -B build \
+            -G "Visual Studio 16 2019" \
+            -A ${{ matrix.generator-platform }} \
+            # EOL
 
       - name: Build
-        shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
-          && cmake --build build --config RelWithDebInfo
+          cmake \
+            --build build \
+            --config RelWithDebInfo \
+            # EOL
 
       - name: Upload
         run: |

CMakeLists.txt

@@ -290,7 +290,6 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/sfall_arrays.h"
     "src/touch.cc"
     "src/touch.h"
-    "src/scan_unimplemented.cc"
 )
 
 if(IOS)

README.md

@@ -96,32 +96,16 @@ 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.
 
-Additionally, the [graphics] section provides options for fine tuning the appearence of the game. The included settings are:
+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).
 
-```
-[graphics]
-fullscreen=0 ; 1 = fullscreeen, 0 = windowed
-game_height=480 ; main play area height
-game_width=640 ; main play area width
-scale2x=0 ; 0 = original scale, 1 = 2x - requires increasing the minimum resolution from 640x480 to 1280x960.
-splash_size=0 ; 0 = normal, 1 = aspect stretch, 2 = fullscreen stretch
-```
+```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.
 
-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 graphcs settings will receive an in-game interface. For the time being it must be configured manually.
-
-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)
-
-Further, Fallout2-CE supports the following additional settings in ddraw.ini:
-
-```
-[Misc]
+[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
@@ -141,21 +125,21 @@ 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
 ```
 
-*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 be found here: [f2_res.dat](https://github.com/fallout2-ce/fallout2-ce/raw/refs/heads/mainmenu/files/f2_res.dat)
+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.
 
-## Quality of life benefits over vanilla Fallout
+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)
 
-* Large game area support (through HiResMode=1 in ddraw.ini and game_height=480 and game_width=640 settings in fallout2.cfg)
-* Increased pathfinding nodes 5x for more accurate pathfinding
-* Ctrl-click to quickly move items when bartering, looting, or stealing
-* _a_ to select "all" when selecting item quantity
-* _a_ to `Take All` when looting
-* When bartering, caps default to the right amount to balance the trade (if possible)
-* Music continues playing between maps (requires config)
-* Auto open doors (requires config)
+*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.
+
+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)
 
 ## Contributing
 

files/ddraw.ini

@@ -4,39 +4,11 @@
 [Main]
 
 ;Set to one to hide areas outside map bounds when using higher than 640x480 resolution, and to zero to disable
-;EnableHighResolutionStencil=1
-
+;HiResMode=1
 
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Misc]
 
-; 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=5
-
-
-;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=1
-
-;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.
-IFACE_BAR_WIDTH=800
-
-;Adds Fallout 1 style travel/trail dots
-WorldMapTravelMarkers=0
-
-;Prevents pausing music between map areas with the same music
-GaplessMusic=0
-
 ;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