dat loading switch

Added switch for loading falloutce.dat, before or after master, depending on presence of original master.dat

Added master_override setting in fallout2.cfg, to declare a master.dat to be original

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

@@ -1,384 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches:
-      - main
-  pull_request: # TODO: Remove this after debugging
-    types:
-      - opened
-      - synchronize
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  android:
-    name: Android Release
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v4
-
-      - name: Setup Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 11
-          cache: gradle
-
-      - name: Cache cmake build
-        uses: actions/cache@v4
-        with:
-          path: os/android/app/.cxx
-          key: android-cmake-v101
-
-      - name: Setup signing config
-        if: env.KEYSTORE_FILE_BASE64 != '' && env.KEYSTORE_PROPERTIES_FILE_BASE64 != ''
-        run: |
-          cd os/android
-          echo "$KEYSTORE_FILE_BASE64" | base64 --decode > release.keystore
-          echo "$KEYSTORE_PROPERTIES_FILE_BASE64" | base64 --decode > release-keystore.properties
-        env:
-          KEYSTORE_FILE_BASE64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_FILE_BASE64 }}
-          KEYSTORE_PROPERTIES_FILE_BASE64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_PROPERTIES_FILE_BASE64 }}
-
-      - name: Build
-        run: |
-          cd os/android
-          ./gradlew assembleRelease
-
-      - name: Change apk file name
-        run: |
-          ls -laR .
-          mv os/android/app/build/outputs/apk/release/app-release.apk os/android/app/build/outputs/apk/release/fallout2-ce.apk
-
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: fallout2-ce.apk
-          path: os/android/app/build/outputs/apk/release/fallout2-ce.apk
-          retention-days: 7
-
-  ios:
-    name: iOS Release
-
-    runs-on: macos-14
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v4
-
-      - name: Cache cmake build
-        uses: actions/cache@v4
-        with:
-          path: out
-          key: ios-cmake-v101
-
-      - name: Configure
-        run: |
-          cmake --preset ios
-
-      - name: Build
-        run: |
-          cmake --build --preset ios-release
-
-      - name: Pack      
-        run: |
-          ls -laR .
-          cd out/build/ios
-          # cpack -C Release  # No need, we already have .ipa
-
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: fallout2-ce.ipa
-          path:  out/build/ios/fallout2-ce.ipa
-          retention-days: 7
-
-  linux:
-    name: Linux ${{ matrix.arch }} Release
-
-    runs-on: ubuntu-22.04
-
-    strategy:
-      fail-fast: false
-      matrix:
-        arch:
-          - x86
-          - x64
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v4
-
-      - name: Dependencies (x86)
-        if: matrix.arch == 'x86'
-        run: |
-          sudo dpkg --add-architecture i386
-          sudo apt update
-          sudo apt install g++-multilib libsdl2-dev:i386 zlib1g-dev:i386
-
-      - name: Dependencies (x64)
-        if: matrix.arch == 'x64'
-        run: |
-          sudo apt update
-          sudo apt install libsdl2-dev zlib1g-dev
-
-      - name: Cache cmake build
-        uses: actions/cache@v4
-        with:
-          path: out
-          key: linux-${{ matrix.arch }}-cmake-v101
-
-      - name: Configure
-        run: |
-          cmake --preset linux-${{ matrix.arch }}-release
-
-      - name: Build
-        run: |
-          cmake --build --preset linux-${{ matrix.arch }}-release
-
-      - name: Change executable file name
-        run: |
-          mv out/build/linux-${{ matrix.arch }}-release/fallout2-ce out/build/linux-${{ matrix.arch }}-release/fallout2-ce-linux-${{ matrix.arch }}
-
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: fallout2-ce-linux-${{ matrix.arch }}
-          path:  out/build/linux-${{ matrix.arch }}-release/fallout2-ce-linux-${{ matrix.arch }}
-          retention-days: 7
-
-  linux-armhf:
-    name: Linux armhf Release
-
-    runs-on: ubuntu-22.04-arm
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v4
-
-      - name: Dependencies
-        run: |
-          sudo dpkg --add-architecture armhf
-          sudo apt update
-          sudo apt install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libsdl2-dev:armhf zlib1g-dev:armhf
-
-      - name: Configure
-        run: |
-          cmake \
-            -B build \
-            -D CMAKE_BUILD_TYPE=RelWithDebInfo \
-            -D FALLOUT_VENDORED=OFF \
-            -D CMAKE_SYSTEM_PROCESSOR=arm \
-            -D CMAKE_C_COMPILER=arm-linux-gnueabihf-gcc \
-            -D CMAKE_CXX_COMPILER=arm-linux-gnueabihf-g++ \
-            # EOL
-
-      - name: Build
-        run: cmake --build build
-
-      - name: Change executable file name
-        run: |
-          mv build/fallout2-ce build/fallout2-ce-linux-armhf
-
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: fallout2-ce-linux-armhf
-          path:  build/fallout2-ce-linux-armhf
-          retention-days: 7
-
-  linux-arm64:
-    name: Linux arm64 Release
-    runs-on: ubuntu-22.04-arm
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v4
-
-      - name: Dependencies
-        run: |
-          sudo apt update
-          sudo apt install libsdl2-dev zlib1g-dev
-
-      - name: Configure
-        run: cmake -B build -D CMAKE_BUILD_TYPE=RelWithDebInfo -D FALLOUT_VENDORED=OFF
-
-      - name: Build
-        run: cmake --build build
-
-      - name: Change executable file name
-        run: |
-          mv build/fallout2-ce build/fallout2-ce-linux-arm64
-
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: fallout2-ce-linux-arm64
-          path:  build/fallout2-ce-linux-arm64
-          retention-days: 7
-
-  macos:
-    name: macOS Release
-
-    runs-on: macos-14
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v4
-
-      - name: Cache cmake build
-        uses: actions/cache@v4
-        with:
-          path: out
-          key: macos-cmake-v101
-
-      - name: Configure
-        run: |
-          cmake --preset macos
-
-      - name: Build
-        run: |
-          cmake --build --preset macos-release
-
-      - name: Pack
-        run: |
-          ls -laR .
-          cd out/build/macos
-          # cpack -C Release # There is already .dmg in the folder
-
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: fallout2-ce-macos.dmg
-          path: out/build/macos/Fallout II Community Edition.dmg
-          retention-days: 7
-
-  windows:
-    name: Windows ${{ matrix.arch }} Release
-
-    runs-on: windows-2025
-
-    strategy:
-      fail-fast: false
-      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
-        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-v101
-
-      - name: Configure
-        shell: cmd
-        run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\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 --preset windows-${{ matrix.arch }}-release
-
-      - name: Change executable file name
-        run: |
-          mv out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce.exe out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce-${{ matrix.arch }}.exe
-
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: fallout2-ce-windows-${{ matrix.arch }}
-          path:  out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce-${{ matrix.arch }}.exe
-          retention-days: 7
-
-
-  release:
-    name: Release Continuous build
-    runs-on: ubuntu-latest
-    needs: [android, ios, linux, linux-armhf, linux-arm64, macos, windows]
-    permissions: write-all
-    steps:
-      - name: Fetch artifacts
-        if: ${{ always() && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
-        uses: actions/download-artifact@v4.1.7
-        with:
-          path: artifacts/
-
-      - name: Remove old release
-        if: ${{ always() && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
-        uses: dev-drprasad/delete-tag-and-release@v0.2.1
-        with:
-          delete_release: true
-          tag_name: continious
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Move unpacked artifacts to root folder
-        if: ${{ always() && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
-        run: |
-          ls -Rlah .
-          find .
-          cd artifacts/
-          for folder in *; do
-            if [[ -d "$folder" && "$folder" != "." ]]; then
-              echo "Processing $folder"
-              mv "$folder" "$folder.dir"
-              cd "$folder.dir"
-              for file in *; do
-                if [ -f "$file" ]; then
-                  if [ -f "../$file" ]; then
-                    echo "ERROR: Duplicate artifact file name $file"
-                    exit 1
-                  fi
-                  if [ -d "../$file" ]; then
-                    echo "ERROR: Duplicate artifact folder $file"
-                    exit 1
-                  fi
-
-                  echo "Moving $file"
-                  mv "$file" "../$file"
-                fi
-              done
-              cd ..
-              rm -rf "$folder.dir"
-            fi
-          done
-          ls -Rlah .
-          find .
-          cd ../
-
-      - name: Allow GitHub to process removed release for few seconds
-        if: ${{ always() && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
-        run: |
-          sleep 20s
-
-      - name: Upload new release
-        if: ${{ always() && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
-        uses: softprops/action-gh-release@v0.1.15
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          files: artifacts/*
-          tag_name: continious
-          draft: false
-          prerelease: false
-          name: Fallout2-CE Continuous Build

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

@@ -14,16 +14,6 @@ jobs:
     runs-on: ubuntu-latest
     permissions: write-all
     steps:
-      - name: start deployment
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
-        uses: bobheadxi/deployments@v1
-        id: deployment
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          step: start
-          debug: true
-          env: preview-${{ github.event.pull_request.number }}
-
       - name: Clone
         uses: actions/checkout@v4
 
@@ -86,10 +76,6 @@ jobs:
           SITE_BASE:  ${{ steps.set-path.outputs.SITE_BASE }}
           F2_GAME_VERSION: Game=${{github.event.pull_request.head.sha || github.sha }}
 
-      - name: Place hash file
-        if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
-        run: echo "$GITHUB_SHA" > fallout2-ce-ems/dist/site_hash.txt
-
       - name: Install rsync (required for the next step)
         if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
         run: |
@@ -105,37 +91,10 @@ jobs:
           clean: false
           single-commit: true
 
-
-
-      - name: Check that site is deployed
-        if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
-        run: |
-          URL="$SITE_ORIGIN""$SITE_BASE""site_hash.txt"
-          echo "Expecting $GITHUB_SHA from $URL"
-          for i in `seq 1 80`; do
-            got="$(curl -fsSL --max-time 10 "$URL" | tr -d '\r\n' || true)"
-            if [ "$got" = "$GITHUB_SHA" ]; then
-              echo "✅ Match on attempt $i: ${got}"
-              exit 0
-            fi
-            echo "Received $got, waiting"
-            sleep 5
-          done
-          exit 1
-
-        env:
-          SITE_ORIGIN: https://${{ github.repository_owner }}.github.io
-          SITE_BASE: ${{ steps.set-path.outputs.SITE_BASE }}
-
-      - name: Update deployment status
+      - name: Comment preview URL on PR
         if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
-        uses: bobheadxi/deployments@v1
-        with:
-          step: finish
-          status: success
-          debug: true
-          env: ${{ steps.deployment.outputs.env }}
-          deployment_id: ${{ steps.deployment.outputs.deployment_id }}
-          ref: ${{ github.event.pull_request.head.sha }}
-          env_url: https://${{ github.repository_owner }}.github.io/fallout2-ce/PR-${{ github.event.pull_request.number }}/
-
+        run: |
+          gh pr comment ${{ github.event.pull_request.number }} \
+            --body "🚀 WebAssembly PR Preview for ${{github.event.pull_request.head.sha || github.sha }} is available at: https://${{ github.repository_owner }}.github.io/fallout2-ce/PR-${{ github.event.pull_request.number }}/"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci-build.yml

@@ -87,7 +87,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: os/android/app/.cxx
-          key: android-cmake-v101
+          key: android-cmake-v100
 
       - name: Setup signing config
         if: env.KEYSTORE_FILE_BASE64 != '' && env.KEYSTORE_PROPERTIES_FILE_BASE64 != ''
@@ -106,13 +106,13 @@ jobs:
 
       - name: Change apk file name
         run: |
-          mv os/android/app/build/outputs/apk/debug/app-debug.apk os/android/app/build/outputs/apk/debug/fallout2-ce-debug.apk
+          mv os/android/app/build/outputs/apk/debug/app-debug.apk os/android/app/build/outputs/apk/debug/fallout2-ce.apk
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
           name: fallout2-ce-debug.apk
-          path: os/android/app/build/outputs/apk/debug/fallout2-ce-debug.apk
+          path: os/android/app/build/outputs/apk/debug/fallout2-ce.apk
           retention-days: 7
 
   ios:
@@ -128,7 +128,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: out
-          key: ios-cmake-v101
+          key: ios-cmake-v100
 
       - name: Configure
         run: |
@@ -142,13 +142,12 @@ jobs:
         run: |
           cd out/build/ios
           cpack -C Debug
-          mv fallout2-ce.ipa fallout2-ce-debug.ipa
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: fallout2-ce-debug.ipa
-          path:  out/build/ios/fallout2-ce-debug.ipa
+          name: fallout2-ce.ipa
+          path:  out/build/ios/fallout2-ce.ipa
           retention-days: 7
 
   linux:
@@ -184,7 +183,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: out
-          key: linux-${{ matrix.arch }}-cmake-v101
+          key: linux-${{ matrix.arch }}-cmake-v100
 
       - name: Configure
         run: |
@@ -201,7 +200,7 @@ jobs:
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: fallout2-ce-linux-${{ matrix.arch }}-debug
+          name: fallout2-ce-linux-${{ matrix.arch }}
           path:  out/build/linux-${{ matrix.arch }}-debug/fallout2-ce-linux-${{ matrix.arch }}
           retention-days: 7
 
@@ -236,13 +235,13 @@ jobs:
 
       - name: Change executable file name
         run: |
-          mv build/fallout2-ce build/fallout2-ce-linux-armhf-debug
+          mv build/fallout2-ce build/fallout2-ce-linux-armhf
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: fallout2-ce-linux-armhf-debug
-          path:  build/fallout2-ce-linux-armhf-debug
+          name: fallout2-ce-linux-armhf
+          path:  build/fallout2-ce-linux-armhf
           retention-days: 7
 
   linux-arm64:
@@ -267,13 +266,13 @@ jobs:
 
       - name: Change executable file name
         run: |
-          mv build/fallout2-ce build/fallout2-ce-linux-arm64-debug
+          mv build/fallout2-ce build/fallout2-ce-linux-arm64
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: fallout2-ce-linux-arm64-debug
-          path:  build/fallout2-ce-linux-arm64-debug
+          name: fallout2-ce-linux-arm64
+          path:  build/fallout2-ce-linux-arm64
           retention-days: 7
 
   macos:
@@ -289,7 +288,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: out
-          key: macos-cmake-v101
+          key: macos-cmake-v100
 
       - name: Configure
         run: |
@@ -303,13 +302,12 @@ jobs:
         run: |
           cd out/build/macos
           cpack -C Debug
-          mv "Fallout II Community Edition.dmg" "Fallout II Community Edition Debug.dmg"
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: fallout2-ce-macos-debug.dmg
-          path: out/build/macos/Fallout II Community Edition Debug.dmg
+          name: fallout2-ce-macos.dmg
+          path: out/build/macos/Fallout II Community Edition.dmg
           retention-days: 7
 
   windows:
@@ -335,11 +333,11 @@ jobs:
         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-v102
+      - name: Cache cmake build
+        uses: actions/cache@v4
+        with:
+          path: out
+          key: windows-${{ matrix.arch }}-cmake-v100
 
       - name: Configure
         shell: cmd
@@ -351,22 +349,22 @@ jobs:
         shell: cmd
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
-          && cmake --build --preset windows-${{ matrix.arch }}-debug
+          && cmake --build --preset windows-${{ matrix.arch }}-release
 
       - name: Change executable file name
         run: |
-          mv out/build/windows-${{ matrix.arch }}/Debug/fallout2-ce.exe out/build/windows-${{ matrix.arch }}/Debug/fallout2-ce-${{ matrix.arch }}-debug.exe
+          mv out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce.exe out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce-${{ matrix.arch }}.exe
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: fallout2-ce-windows-${{ matrix.arch }}-debug
-          path:  out/build/windows-${{ matrix.arch }}/Debug/fallout2-ce-${{ matrix.arch }}-debug.exe
+          name: fallout2-ce-windows-${{ matrix.arch }}
+          path:  out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce-${{ matrix.arch }}.exe
           retention-days: 7
 
 
   release:
-    name: Debug Release Continuous build
+    name: Release Continuous build
     runs-on: ubuntu-latest
     needs: [android, ios, linux, linux-armhf, linux-arm64, macos, windows]
     permissions: write-all
@@ -382,7 +380,7 @@ jobs:
         uses: dev-drprasad/delete-tag-and-release@v0.2.1
         with:
           delete_release: true
-          tag_name: continious-debug
+          tag_name: continious
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -431,7 +429,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           files: artifacts/*
-          tag_name: continious-debug
+          tag_name: continious
           draft: false
           prerelease: true
           name: Fallout2-CE Continuous Build

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

@@ -12,7 +12,6 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: write
-      deployments: write
     steps:
       - name: Checkout gh-pages branch
         uses: actions/checkout@v4
@@ -44,12 +43,4 @@ jobs:
           else
             git commit --amend -m "🚮 Remove preview for closed PR #${{ github.event.pull_request.number }}"
             git push --force
-          fi
-
-      - name: mark environment as deactivated
-        uses: bobheadxi/deployments@v1
-        with:
-          step: deactivate-env
-          env: preview-${{ github.event.pull_request.number }}
-          desc: Environment was pruned
-          debug: true
+          fi

CMakeLists.txt

@@ -288,16 +288,11 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/sfall_opcodes.h"
     "src/sfall_arrays.cc"
     "src/sfall_arrays.h"
-    "src/sfall_callbacks.cc"
-    "src/sfall_callbacks.h"
     "src/touch.cc"
     "src/touch.h"
     "src/scan_unimplemented.cc"
-	"third_party/lodepng/lodepng.cpp"
 )
 
-target_include_directories(${EXECUTABLE_NAME} PUBLIC "third_party/lodepng")
-
 if(IOS)
     target_sources(${EXECUTABLE_NAME} PUBLIC
         "src/platform/ios/paths.h"

README.md

@@ -44,7 +44,7 @@ $ sudo apt install libsdl2-2.0-0
 
 - Alternatively you can use Fallout 2 from Macplay/The Omni Group as a base - you need to extract game assets from the original bundle. Mount CD/DMG, right click `Fallout 2` -> `Show Package Contents`, navigate to `Contents/Resources`. Copy `GameData` folder somewhere, for example `/Applications/Fallout2`.
 
-- Or if you're a Terminal user and have Homebrew installed you can extract the needed files from the GoG installer.  **Note**: You must use "Offline backup game installer", not the main game installer.
+- Or if you're a Terminal user and have Homebrew installed you can extract the needed files from the GoG installer:
 
 ```console
 $ brew install innoextract
@@ -96,16 +96,32 @@ 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).
+Additionally, the [graphics] section provides options for fine tuning the appearence of the game. The included settings are:
 
-```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.
+```
+[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
+```
 
-[IFACE]
+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]
 ; 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
@@ -128,22 +144,11 @@ IFACE_BAR_SIDES_ORI=0
 ;IFACE_BAR_WIDTH=640
 ```
 
-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)
-
-*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)
+*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)
 
 ## Quality of life benefits over vanilla Fallout
 
-* High resolution support
+* 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

files/ddraw.ini

@@ -10,6 +10,33 @@
 ;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