Merge branch 'main' into platform_compat

Solidify opcode_exists (#579 )
* Solidify opcode_exists * add arg validation
2026-07-27 16:47:11 -07:00 · 2026-07-22 11:58:01 +03:00 · 2026-07-21 08:54:38 -07:00 · 2026-07-21 13:36:18 +03:00 · 2026-07-20 21:49:04 -07:00 · 2026-07-20 20:56:26 -07:00
156 changed files with 6822 additions and 7986 deletions
@@ -122,6 +122,7 @@ jobs:
          mkdir -p out/dist/fallout2-ce-android-debug
          cp os/android/app/build/outputs/apk/debug/app-debug.apk out/dist/fallout2-ce-android-debug/fallout2-ce.apk
          cp out/dist/ce.dat out/dist/fallout2-ce-android-debug/ce.dat
+          cp files/fallout2.cfg out/dist/fallout2-ce-android-debug/EXAMPLE_fallout2.cfg
          cd out/dist
          zip -r fallout2-ce-android-debug.zip fallout2-ce-android-debug

@@ -141,7 +142,7 @@ jobs:
  ios:
    name: iOS

-    runs-on: macos-14
+    runs-on: macos-15
    needs: [ce-dat]

    steps:
@@ -178,6 +179,7 @@ jobs:
          mkdir -p out/dist/fallout2-ce-ios
          cp out/build/ios/fallout2-ce.ipa out/dist/fallout2-ce-ios/fallout2-ce-ios.ipa
          cp out/dist/ce.dat out/dist/fallout2-ce-ios/ce.dat
+          cp files/fallout2.cfg out/dist/fallout2-ce-ios/EXAMPLE_fallout2.cfg
          cd out/dist
          zip -r fallout2-ce-ios.zip fallout2-ce-ios

@@ -243,6 +245,7 @@ jobs:
          mkdir -p out/dist/fallout2-ce-linux-${{ matrix.arch }}
          cp out/build/linux-${{ matrix.arch }}-debug/fallout2-ce out/dist/fallout2-ce-linux-${{ matrix.arch }}/fallout2-ce
          cp out/dist/ce.dat out/dist/fallout2-ce-linux-${{ matrix.arch }}/ce.dat
+          cp files/fallout2.cfg out/dist/fallout2-ce-linux-${{ matrix.arch }}/EXAMPLE_fallout2.cfg
          tar -czvf out/dist/fallout2-ce-linux-${{ matrix.arch }}.tar.gz -C out/dist fallout2-ce-linux-${{ matrix.arch }}

      - name: Upload
@@ -252,23 +255,38 @@ jobs:
          path: out/dist/fallout2-ce-linux-${{ matrix.arch }}.tar.gz
          retention-days: 7

-  linux-armhf:
-    name: Linux (armhf)
+  linux-arm:
+    name: Linux (${{ matrix.arch }})

    runs-on: ubuntu-22.04-arm
    needs: [ce-dat]

+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - armhf
+          - arm64
+
    steps:
      - name: Clone
        uses: actions/checkout@v4

-      - name: Dependencies
+      - name: Dependencies (armhf)
+        if: matrix.arch == 'armhf'
        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
+      - name: Dependencies (arm64)
+        if: matrix.arch == 'arm64'
+        run: |
+          sudo apt update
+          sudo apt install libsdl2-dev zlib1g-dev
+
+      - name: Configure (armhf)
+        if: matrix.arch == 'armhf'
        run: |
          cmake \
            -B build \
@@ -279,45 +297,8 @@ jobs:
            -D CMAKE_CXX_COMPILER=arm-linux-gnueabihf-g++ \
            # EOL

-      - name: Build
-        run: cmake --build build
-
-      - name: Download ce.dat
-        uses: actions/download-artifact@v4
-        with:
-          name: ce-dat
-          path: out/dist
-
-      - name: Package
-        run: |
-          mkdir -p out/dist/fallout2-ce-linux-armhf
-          cp build/fallout2-ce out/dist/fallout2-ce-linux-armhf/fallout2-ce
-          cp out/dist/ce.dat out/dist/fallout2-ce-linux-armhf/ce.dat
-          tar -czvf out/dist/fallout2-ce-linux-armhf.tar.gz -C out/dist fallout2-ce-linux-armhf
-
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: fallout2-ce-linux-armhf
-          path: out/dist/fallout2-ce-linux-armhf.tar.gz
-          retention-days: 7
-
-  linux-arm64:
-    name: Linux (arm64)
-
-    runs-on: ubuntu-22.04-arm
-    needs: [ce-dat]
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v4
-
-      - name: Dependencies
-        run: |
-          sudo apt update
-          sudo apt install libsdl2-dev zlib1g-dev
-
-      - name: Configure
+      - name: Configure (arm64)
+        if: matrix.arch == 'arm64'
        run: cmake -B build -D CMAKE_BUILD_TYPE=Debug -D FALLOUT_VENDORED=OFF

      - name: Build
@@ -331,22 +312,23 @@ jobs:

      - name: Package
        run: |
-          mkdir -p out/dist/fallout2-ce-linux-arm64
-          cp build/fallout2-ce out/dist/fallout2-ce-linux-arm64/fallout2-ce
-          cp out/dist/ce.dat out/dist/fallout2-ce-linux-arm64/ce.dat
-          tar -czvf out/dist/fallout2-ce-linux-arm64.tar.gz -C out/dist fallout2-ce-linux-arm64
+          mkdir -p out/dist/fallout2-ce-linux-${{ matrix.arch }}
+          cp build/fallout2-ce out/dist/fallout2-ce-linux-${{ matrix.arch }}/fallout2-ce
+          cp out/dist/ce.dat out/dist/fallout2-ce-linux-${{ matrix.arch }}/ce.dat
+          cp files/fallout2.cfg out/dist/fallout2-ce-linux-${{ matrix.arch }}/EXAMPLE_fallout2.cfg
+          tar -czvf out/dist/fallout2-ce-linux-${{ matrix.arch }}.tar.gz -C out/dist fallout2-ce-linux-${{ matrix.arch }}

      - name: Upload
        uses: actions/upload-artifact@v4
        with:
-          name: fallout2-ce-linux-arm64
-          path: out/dist/fallout2-ce-linux-arm64.tar.gz
+          name: fallout2-ce-linux-${{ matrix.arch }}
+          path: out/dist/fallout2-ce-linux-${{ matrix.arch }}.tar.gz
          retention-days: 7

  macos:
    name: macOS

-    runs-on: macos-14
+    runs-on: macos-15

    steps:
      - name: Clone
@@ -431,6 +413,7 @@ jobs:
          mkdir -p out/dist/fallout2-ce-windows-${{ matrix.arch }}
          cp out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce.exe out/dist/fallout2-ce-windows-${{ matrix.arch }}/fallout2-ce.exe
          cp out/dist/ce.dat out/dist/fallout2-ce-windows-${{ matrix.arch }}/ce.dat
+          cp files/fallout2.cfg out/dist/fallout2-ce-windows-${{ matrix.arch }}/EXAMPLE_fallout2.cfg
          cd out/dist
          7z a fallout2-ce-windows-${{ matrix.arch }}.zip fallout2-ce-windows-${{ matrix.arch }}

@@ -445,7 +428,7 @@ jobs:
  release:
    name: Release Continuous build
    runs-on: ubuntu-latest
-    needs: [android, ios, linux, linux-armhf, linux-arm64, macos, windows]
+    needs: [android, ios, linux, linux-arm, macos, windows]
    permissions:
      contents: write
    steps:
@@ -70,6 +70,7 @@ jobs:
          mkdir -p out/dist/fallout2-ce-android
          cp os/android/app/build/outputs/apk/release/app-release.apk out/dist/fallout2-ce-android/fallout2-ce-android.apk
          cp out/dist/ce.dat out/dist/fallout2-ce-android/ce.dat
+          cp files/fallout2.cfg out/dist/fallout2-ce-android/EXAMPLE_fallout2.cfg
          cd out/dist
          zip -r fallout2-ce-android.zip fallout2-ce-android
          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-android.zip
@@ -130,6 +131,7 @@ jobs:
          mkdir -p out/dist/fallout2-ce-ios
          cp build/fallout2-ce.ipa out/dist/fallout2-ce-ios/fallout2-ce-ios.ipa
          cp out/dist/ce.dat out/dist/fallout2-ce-ios/ce.dat
+          cp files/fallout2.cfg out/dist/fallout2-ce-ios/EXAMPLE_fallout2.cfg
          cd out/dist
          zip -r fallout2-ce-ios.zip fallout2-ce-ios
          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-ios.zip
@@ -211,6 +213,7 @@ jobs:
          mkdir -p out/dist/fallout2-ce-linux-${{ matrix.arch }}
          cp build/fallout2-ce out/dist/fallout2-ce-linux-${{ matrix.arch }}/fallout2-ce
          cp out/dist/ce.dat out/dist/fallout2-ce-linux-${{ matrix.arch }}/ce.dat
+          cp files/fallout2.cfg out/dist/fallout2-ce-linux-${{ matrix.arch }}/EXAMPLE_fallout2.cfg
          tar -czvf fallout2-ce-linux-${{ matrix.arch }}.tar.gz -C out/dist fallout2-ce-linux-${{ matrix.arch }}
          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-linux-${{ matrix.arch }}.tar.gz
          rm fallout2-ce-linux-${{ matrix.arch }}.tar.gz
@@ -341,6 +344,7 @@ jobs:
          mkdir -p out/dist/fallout2-ce-windows-${{ matrix.arch }}
          cp out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce.exe out/dist/fallout2-ce-windows-${{ matrix.arch }}/fallout2-ce.exe
          cp out/dist/ce.dat out/dist/fallout2-ce-windows-${{ matrix.arch }}/ce.dat
+          cp files/fallout2.cfg out/dist/fallout2-ce-windows-${{ matrix.arch }}/EXAMPLE_fallout2.cfg
          cd out/dist
          7z a fallout2-ce-windows-${{ matrix.arch }}.zip fallout2-ce-windows-${{ matrix.arch }}
          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-windows-${{ matrix.arch }}.zip
@@ -6,10 +6,10 @@ set(EXECUTABLE_NAME fallout2-ce)

 if(APPLE)
    if(IOS)
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "")
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "13" CACHE STRING "")
        set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "")
    else()
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "")
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "")
        set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "")
    endif()
 endif()
@@ -614,8 +614,6 @@ if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
    target_sources(mapper-ce PUBLIC
        ${FALLOUT_ENGINE_SOURCES}
        ${FALLOUT_PLATFORM_SOURCES}
-        "src/proto_txt.cc"
-        "src/proto_txt.h"
        "src/mapper/map_edge_setup.cc"
        "src/mapper/map_edge_setup.h"
        "src/mapper/map_func.cc"
@@ -628,8 +626,6 @@ if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
        "src/mapper/mp_proto.h"
        "src/mapper/mp_scrpt.cc"
        "src/mapper/mp_scrpt.h"
-        "src/mapper/mp_spray.cc"
-        "src/mapper/mp_spray.h"
        "src/mapper/mp_targt.cc"
        "src/mapper/mp_targt.h"
        "src/mapper/mp_utils.cc"
@@ -66,8 +66,9 @@ Available commands:
 1. `./<BUILD_DIR>/ce-dat-tool <archive.dat> list [pattern]`
 2. `ce-dat-tool <archive.dat> info [pattern]`
 3. `ce-dat-tool <archive.dat> extract [--lower] <output-dir> [pattern]`
-4. `ce-dat-tool <archive.dat> cat <entry>`
-5. `ce-dat-tool create <input-dir> <archive.dat>`
+4. `ce-dat-tool <archive.dat> extract [--lower] (--file-list|--files-from) <list-file> <output-dir>`
+5. `ce-dat-tool <archive.dat> cat <entry>`
+6. `ce-dat-tool create <input-dir> <archive.dat>`

 Use `--lower` with `extract` when you want every extracted file and directory name forced to lowercase.
 For example:
@@ -1,18 +1,102 @@
 # Fallout 2 Community Engine

-Fallout 2 Community Engine is a fully working re-implementation of the Fallout 2 engine, optimized for a hassle-free experience on multiple platforms.  It provides high resolution support, quality-of-life improvements, and dozens of bug fixes.
+Fallout 2 Community Engine is a fully working re-implementation of the Fallout 2 engine, optimized for a hassle-free experience on multiple platforms, including Windows, Mac, iOS, Android, and Linux.  It provides high resolution support, quality-of-life improvements, and dozens upon dozens of bug fixes.

 This is a fork of the original Fallout2: CE project, which is no longer 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) 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.
+Popular Fallout 2 total conversion mods are partially supported. Nevada and Sonora 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.

-Fallout2: CE has broad (though not total) compatibility with [Sfall](https://github.com/sfall-team/sfall) scripting extensions.  Many traditional Fallout mods work out of the box.
+Fallout2: CE has broad (though not total) compatibility with [Sfall](https://github.com/sfall-team/sfall) scripting extensions.  Many traditional Fallout mods work out of the box, including NPC Armor, Party Orders, FO2Tweaks (we recommend v14.5+), Talking Heads, and many others.

-There is also [Fallout 1 Community Edition](https://github.com/alexbatalov/fallout1-ce) (not affiliated with this fork).
+## Installation — [Download Latest CE Release](https://github.com/fallout2-ce/fallout2-ce/releases)

-## 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).

-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.
+Download CE from the link above, then extract the archive into your game folder. Launch `fallout2-ce.exe` on Windows (or the platform-specific executable) to play. CE has a lot of enhancements that require configuration. See [Configuration](#configuration) for examples.
+
+For detailed instructions on how to play on Mac, Linux, iOS, or Android, see the [Platform-specific instructions](#platform-specific-installation).
+
+## Quality of life benefits over vanilla Fallout
+
+* High resolution support
+* Party members can loot and barter in place of PC
+* Directly equip party members instead of convincing them to use the right equipment.
+* Expanded 2-column inventory, loot screens
+* Expanded 4-row barter screen
+* Expanded AP bar
+* Ctrl-click to quickly move items when bartering, looting, or stealing, and auto-balance caps
+* Music continues playing between maps
+* Auto open doors
+* Integrated "HELP" menu
+* 44.1 kHz stereo sound/music supported, in .ogg and .wav format as well as legacy .acm
+* Last used save slot is remembered
+* Item/Corpse/Container/Critter highlighting (configure using [mods/sfall-mods.ini](https://github.com/sfall-team/sfall/blob/master/artifacts/config_files/sfall-mods.ini))
+
+<table>
+  <tr>
+    <td align="center">
+    <img src="docs/images/two-column-inventory.jpg" alt="Expanded 2-column inventory" width="360"><br>
+    <sub>Expanded 2-column inventory</sub>
+    </td>
+    <td align="center">
+      <img src="docs/images/companion-equip.gif" alt="Companion equip screen" width="360"><br>
+      <sub>Companion equip screen</sub>
+    </td>
+
+  </tr>
+  <tr>
+    <td align="center">
+      <img src="docs/images/party-member-loot.gif" alt="Party member loot" width="360"><br>
+      <sub>Party member loot</sub>
+    </td>
+    <td align="center">
+      <img src="docs/images/help-menu.gif" alt="Integrated HELP menu" width="360"><br>
+      <sub>Integrated HELP menu</sub>
+    </td>
+  </tr>
+</table>
+
+There are also dozens of small things that just work a little better than they did in the original.  Better pathfinding, fewer graphics glitches, less finicky weapon stacking, and much more.
+
+## Configuration
+
+The main configuration file is `fallout2.cfg`. This contains original game config as well as new CE settings.
+
+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).
+
+Here are some important settings in `fallout2.cfg` under the `[screen]` and `[ui]` sections.  See [the example config](https://github.com/fallout2-ce/fallout2-ce/tree/refs/heads/main/files/fallout2.cfg) for a full list of settings.
+
+```ini
+[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)
+
+[ui]
+; Maximum number of columns shown in the main inventory and loot/steal windows (valid range: 1..2)
+inventory_columns=2
+
+; Set to 1 to expand the barter/trade window vertically, adding a 4th item slot per side (requires ce.dat)
+expand_barter_window=1
+
+[qol]
+; Allow opening party member inventory from the long-press context menu.
+party_trade_from_menu=1
+
+; Allow switching to companions' inventories in loot screens (and barter, in the future)
+party_loot_and_barter=1
+```
+
+**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 its 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 an 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)
+
+## Platform-specific installation

 ### Windows

@@ -103,57 +187,6 @@ docker run --rm -v $(pwd):/src emscripten/emsdk:3.1.74 sh -c 'git config --globa
 ```
 - Demo available at https://github.com/ololoken/fallout2-ce-ems.git

-## Configuration
-
-The main configuration file is `fallout2.cfg`. There are several important settings you might need to adjust for your installation. Depending on your Fallout distribution main game assets `master.dat`, `critter.dat`, `patch000.dat`, and `data` folder might be either all lowercased, or all uppercased. You can either update `master_dat`, `critter_dat`, `master_patches` and `critter_patches` settings to match your file names, or rename files to match entries in your `fallout2.cfg`.
-
-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.
-
-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.
-
-Here are some important settings in `fallout2.cfg` under the `[screen]` and `[ui]` sections.  See [the example config](https://github.com/fallout2-ce/fallout2-ce/tree/refs/heads/main/files/fallout2.cfg) for a full list of settings.
-
-```ini
-[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)
-
-[ui]
-;Set to 1 to expand the barter/trade window vertically, adding a 4th item slot per side (requires ce.dat)
-expand_barter_window=1
-;Maximum number of columns shown in the main inventory and loot/steal windows (valid range: 1..2)
-inventory_columns=2
-splash_screen_size=1 ; Splash screen scaling (0=original size, 1=fit preserving aspect, 2=stretch to fill)
-quick_toolbar_visible=0 ; Skills quick access toolbar visibility (iOS only) (0=hidden, 1=visible)
-```
-
-**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. 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)
-
-## Quality of life benefits over vanilla Fallout
-
-* High resolution support
-* Expanded 2-column inventory
-* Expanded 4-row barter screen
-* Expanded AP bar
-* Party members can loot and barter in place of PC
-* 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
-* Auto open doors
-* 44.1 kHz stereo sound/music supported, in .ogg and .wav format as well as legacy .acm
-* Last used save slot is remembered
-* Item/Corpse/Container/Critter highlighting (configure using [mods/sfall-mods.ini](https://github.com/sfall-team/sfall/blob/master/artifacts/config_files/sfall-mods.ini))

 ## Contributing

@@ -38,6 +38,12 @@ The following settings were moved into [`fallout2.cfg`](files/fallout2.cfg) inst
 | `Misc` | `UseWalkDistance` | `qol` | `use_walk_distance` |
 | `Misc` | `AutoOpenDoors` | `qol` | `auto_open_doors` |

+The following settings were moved into [`<DAT>/config/game.cfg`](files/ce.dat/config/game.cfg):
+
+| ddraw.ini section | ddraw.ini key | game.cfg section | game.cfg key |
+| --- | --- | --- | --- |
+| `Misc` | `StartGDialogFix` | `dialog` | `start_gdialog_fix` |
+
 ## Opcodes / Metarules

 See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/) for documentation on specific functions.
@@ -53,7 +59,7 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
 | 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 | in_world_map<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 | play_sfall_sound<br>stop_sfall_sound | ✅ | `play_sfall_sound` currently supports `.acm`, `.wav`, `.ogg` formats, and can load from `.dat` archives. `.mp3` is not yet supported. |
 | Combat / Weapons and ammo | get/set_weapon_ammo_pid<br>get/set_weapon_ammo_count | ✅ | - |
@@ -63,7 +69,7 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
 | 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 | - |
+| Art and appearance | art_exists<br>art_frame_data<br>refresh_pc_art<br>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. |
@@ -75,18 +81,20 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
 | 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 | ✅ except block_combat, force_aimed_shots, disable_aimed_shots, get_last_target, get_last_attacker, set_spray_settings | - |
 | 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 / Windows and images | interface_art_draw<br>interface_print<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 | ✅ except interface_print, interface_overlay | - |
 | 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 / Inventory | display_stats<br>inventory_redraw<br>critter_inven_obj2<br>get_current_inven_size<br>item_weight | ✅ except get_current_inven_size | - |
 | 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, set_unique_id, obj_is_openable, get_proto_data, set_proto_data | - |
+| 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 | ✅ | `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 | ✅ except set_dude_obj, set_scr_name | `get/set_object_data` maps supported object and `C_ATTACK_*` offsets instead of exposing arbitrary raw memory offsets. |
 | 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/set_unspent_ap_perk_bonus<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, get/set_unspent_ap{_perk}_bonus, get/set_inven_ap_cost | - |
 | 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. |
+| Hero Appearance | set_dm/df_model<br>hero_select_win<br>set_hero_race<br>set_hero_style | not implemented | - |
+| Events | add_g_timer_event<br>remove_timer_event<br>create_spatial<br>spatial_radius | not implemented | - |
+| Other | get_year<br>active_hand<br>toggle_active_hand<br>get/set_viewport_x/y<br>get_light_level<br>message_str_game<br>sneak_success<br>unwield_slot<br>add_extra_msg_file<br>get_metarule_table<br>metarule_exist<br> | ✅ except get/set_viewport_x/y, sneak_success  | `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

@@ -102,10 +110,10 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
 | 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` | 🚫 | - |
+| RemoveInvenObj | `HOOK_REMOVEINVENOBJ` | ✅ | - |
 | BarterPrice | `HOOK_BARTERPRICE` | ✅ | - |
-| MoveCost | `HOOK_MOVECOST` | 🚫 | - |
-| ItemDamage | `HOOK_ITEMDAMAGE` | 🚫 | - |
+| ItemDamage | `HOOK_ITEMDAMAGE` | ✅ | - |
+| MoveCost | `HOOK_MOVECOST` | ✅ | - |
 | AmmoCost | `HOOK_AMMOCOST` | ✅ | Requires `check_weapon_ammo_cost=1` if you want pre-attack ammo validation to respect per-shot/per-round overrides. |
 | KeyPress | `HOOK_KEYPRESS` | ✅ | Third hook arg is currently `0`; CE doesn't use VK codes. |
 | MouseClick | `HOOK_MOUSECLICK` | ✅ | - |
@@ -38,6 +38,9 @@ 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
+; Set to 1 to enable the sfall StartGDialogFix behavior: talking-head dialogs honor the start_gdialog mood argument unless it is -1.
+; When set to 0, CE still applies sfall's crash fix for calling start_gdialog outside talk_p_proc.
+start_gdialog_fix=0

 [main_menu]
 ; Custom version string shown on the main menu. Supports up to two %d placeholders for the game version numbers.
@@ -0,0 +1 @@
+{0}{}{HELP}
@@ -0,0 +1 @@
+{0}{}{AIDE}
@@ -0,0 +1 @@
+{0}{}{HILFE}
@@ -0,0 +1 @@
+{0}{}{AIUTO}
@@ -0,0 +1 @@
+{0}{}{POMOC}
@@ -0,0 +1 @@
+{0}{}{AJUDA}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
IronKing24	8a4469cc57	Merge branch 'main' into platform_compat	2026-07-22 11:58:01 +03:00
Mike Klaas	94a7e7207c	Solidify opcode_exists (#579 ) * Solidify opcode_exists * add arg validation	2026-07-21 08:54:38 -07:00
alpacacommunist-cmd	b8988b69a8	combatAi: heap fragmentation fix, free previously initialized lists before init (#569 ) * free previously initialized lists before init * adds reasoning comment, safer verification	2026-07-21 13:36:18 +03:00
Mike Klaas	9467f4f778	Allow compat_resolve_path to handle duplicate path separators (#575 ) Alternate fix for https://github.com/fallout2-ce/fallout2-ce/pull/563.	2026-07-20 21:49:04 -07:00
V4nnura	447cf6edff	Unify linux-armhf and linux-arm64 yaml code. (#574 ) * Unify linux-armhf and linux-arm64.	2026-07-20 20:56:26 -07:00
alpacacommunist-cmd	c9bcb719ee	adds combatSave OBJECT_NO_SAVE predicate + combat list filters (#553 ) * adds combatSave OBJECT_NO_SAVE predicate + combat list filters	2026-07-20 20:43:16 -07:00
Mike Klaas	5dc9135689	Fix start_gdialog talking-head crash (#572 ) Use the start_gdialog target object when deriving talking-head reaction, matching sfall's crash fix for calls outside talk_p_proc. Keep the separate StartGDialogFix behavior as a modder-controlled game.cfg option so mods can opt into honoring explicit mood arguments unless mood is -1. sfall references: - Crash fix/changelog: https://github.com/sfall-team/sfall/blob/d91d01f6256f083fd80a8b90d2202699f604055d/CHANGELOG.md#L171-L175 - Crash patch and StartGDialogFix hook: https://github.com/sfall-team/sfall/blob/d91d01f6256f083fd80a8b90d2202699f604055d/sfall/Modules/BugFixes.cpp#L4138-L4146 - Optional mood behavior hook: https://github.com/sfall-team/sfall/blob/d91d01f6256f083fd80a8b90d2202699f604055d/sfall/Modules/BugFixes.cpp#L2089-L2099 Verified with: make	2026-07-19 10:59:22 -07:00
jirik2077	dfe7eeb3a8	Merge pull request #565 from fallout2-ce/fix_use_after_free_in_use_item_on Heap-use-after-free fix in objectUseItemOnInternal if object or item is destroyed by script itself	2026-07-19 06:29:46 +02:00
jirik2077	436ce12022	Merge branch 'main' into fix_use_after_free_in_use_item_on	2026-07-19 06:18:38 +02:00
Mike Klaas	1bc0711327	Reorganize README and include image examples (#566 ) * Reorganize README and include image examples	2026-07-18 21:15:54 -07:00
jirik2077	5a87638781	review comments	2026-07-19 06:04:34 +02:00
Mike KlaasandCopilot Autofix powered by AI	10f59c6b45	Bundle example config in distribution (#564 ) * add fallout2.cfg docs * flesh out fallout2.cfg * add linux * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-07-18 14:50:29 -07:00
github-actions[bot]	24562f57da	chore: auto-format with clang-format	2026-07-18 19:22:04 +00:00
jirik2077	9711e61f89	fixes heap-use-after-free in objectUseItemOnInternal when object is destoryed by the script (fixing K9 and attaching pole in Mariposa cart)	2026-07-18 21:14:50 +02:00
jirik2077	d8d99fe94a	Merge pull request #562 from fallout2-ce/deobfuscate_color_usage Deobfuscate color usage	2026-07-18 08:38:19 +02:00
github-actions[bot]	1a9211d44d	chore: auto-format with clang-format	2026-07-18 05:04:11 +00:00
jirik2077	d63f293291	fix typo	2026-07-18 07:01:41 +02:00
jirik2077	71eaabc957	unify the flag usage between text_font.h and window_manager.h.. deobfuscate more draw text flags usages	2026-07-18 06:59:35 +02:00
Mike Klaas	aac42c162c	Fix refresh after elevator transition (#561 ) For some RPU elevator transitions, I was seeing the screen partially not update. This was due to rejecting the setCenterTile due scroll blockers (I think). This turns those off if EDG support is enabled. This also seems to fix some of the jittery scrolling I was seeing in diagonal areas like SF	2026-07-17 20:35:38 -07:00
jirik2077	47156d2e45	deobfuscate the font transparency flag	2026-07-18 00:09:13 +02:00
github-actions[bot]	33744ecf2e	chore: auto-format with clang-format	2026-07-17 21:19:31 +00:00
jirik2077	20e80d4bb3	fix the spaces and make rgb to rgb555 color conversion constexpre function	2026-07-17 23:02:48 +02:00
jirik2077	a756bc2700	convert to hexa	2026-07-17 21:51:54 +02:00
jirik2077	de73c90a89	create macros for the color usages	2026-07-17 21:51:26 +02:00
jirik2077	aa439efd04	Add guards for null references in skill.cc (#557 ) * add guards for null reference in skill.cc * removed skillGetBaseValue and add debugPrint	2026-07-17 09:17:37 +02:00
Mike Klaas	41f09fa343	Fix elevator cancelation in RPU (#546 ) * Fix elevator cancelation in RPU If you step into an elevator in RPU and cancel the floor selection, the door closes behind you (sometimes with glitchy graphics). This is a latent bug in the elevators code that vanilla doesn't hit - elevator_select_ mutates the caller’s elevation to a UI/display level before the modal loop. - Escape/cancel returns 0 without writing a destination tile. - Caller then sees map == current map and elevation != current elevation, so it closes the nearby door. - tile is still -1. * NovaRains approach * dont default to first floor if not found	2026-07-16 20:06:48 -07:00
Mike Klaas	44067b1933	Avoid non-critter sneak check in obj_can_see_obj (#560 ) * We call skillGetValue(gDude, SKILL_SNEAK) for every target * For non-critters, that can result in OOB memory reads * We only need it for gDude for sneaking So let's only call it when dude is sneaking and is the target	2026-07-16 20:05:31 -07:00
alpacacommunist-cmdandCopilot Autofix powered by AI	68d7bd0668	Fix heap corruption in wmWorldMap_load when save file has more cities than current config (#533 ) * Fix out-of-bounds write in wmWorldMap_load when numCities exceeds wmMaxAreaNum * use ENTRANCE_LIST_CAPACITY to properly isolate city entrances And read a rest to dummy struct Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * adds debug print warning regarding extra data in .sav --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-07-15 22:11:42 -07:00
Mike Klaas	799184ab96	HOOK_REMOVEINVENOBJ (#540 ) * HOOK_REMOVEINVENOBJ * PR feedback	2026-07-15 21:14:11 -07:00
Mike Klaas	5774372924	Implement `set_object_data`, and add memory safety and correct offsets (#547 ) * Correct `get_object_data` indexes Currently they are raw offset pointers. This does not work with CE since pointers are wide (64bit) on some (most) platforms. So, we can treat these offsets like constants and return the appropriate fields instead. There are already used for the most part as enum constants:	2026-07-15 21:12:33 -07:00
jirik2077	e90b68837d	fix an opposite scroll direction in towns list (#550 )	2026-07-15 07:50:06 +02:00
Mike Klaas	ceecc3ebdb	Two crash fixes (#552 ) * Sfall fix for > 160 maps for automap code (RPU triggers this) * Logic fix for action menu, where actionIndex was incremented unconditionally and could go out of bounds. This was a regression from vanilla	2026-07-14 22:08:18 -07:00
jirik2077	83b6e081b7	Support for EPA gender change operation (#542 ) * support for EPA gender change operation * fix unintented return	2026-07-13 10:44:01 +02:00
Mike Klaas	083bd4a4cc	Implement Sfall npc level cap (10) (#545 ) Also, fix off-by-one error that can cause proto corruption	2026-07-12 21:10:23 -07:00
Mike Klaas	27ae59578a	Implement `real_dude_obj` (#537 ) This is used by scripts which are party-control aware. Implementing this means they won't crash and should still work properly	2026-07-12 20:21:33 -07:00
jirik2077	fdee9914e3	Fix division by zero in objectExamineFunc (#541 )	2026-07-12 18:25:06 +02:00
Mike Klaas	258de7c21e	Increase animation cap (Sfall) (#539 ) Fixes #538	2026-07-11 14:26:34 -07:00
jirik2077	feb0cd61ff	fix healing revision op_tokenize (#536 )	2026-07-11 05:49:44 +02:00
Mike Klaas	cbbe2f00f1	Normalize ini paths that start with `\` to game root (#501 ) * Normalize ini paths that start with `\` to game root Sfall does this, and we were missing it. https://github.com/sfall-team/sfall/blob/master/sfall/Modules/Scripting/Handlers/IniFiles.cpp#L61-L78 An example is InventoryFilter, which starts its ini path with `\`: https://github.com/rotators/InventoryFilter/blob/master/source/gl_InvenFilter.ssl#L19 * Normalize cache key	2026-07-10 15:10:05 -07:00
Mike Klaas	bf1d35b2de	Fix possible double-free in animation_free (#513 ) * Fix possible double-free in animation_free Port of roughly: https://github.com/cambragol/fission-ce/commit/7fafbb11c7daf5fe7f5ae05b92a3bffaaaa7b5a4 Not sure how to trigger it in CE, but seems plausibly possible	2026-07-10 15:09:33 -07:00
Mike Klaas	4a9e822e82	Fix "Uncontrolled format string" Code Scanning results (#512 ) * Fix "Uncontrolled format string" Code Scanning results https://github.com/fallout2-ce/fallout2-ce/security/code-scanning * PR comments * fix missing early return in programExecuteProcedureAsync path	2026-07-10 15:09:15 -07:00
Mike Klaas	843803e26a	Party member equipment management (#528 ) Add equipment slots to the companion loot screen. Items can be equipped directly from player or companion inventory. This also allows switching between party members so you can manage all companion's inventories easily. Does not allow equipping items that would otherwise be disallowed. Also: Calls HOOK_UNWIELD when adding/removing equipment, meaning mods like npc armor work Uses HOOK_CANUSE for weapon use checks Ctrl-click to equip is not implemented since it already transfers items between the two inventories. I tried making it work only for equippable items (and otherwise transfer), but that felt awkward and random. Ctrl-click unequip is implemented.	2026-07-10 15:08:44 -07:00
IronKing24	8bf7064a08	update android ndk version to current lts to support std::fs	2026-07-11 00:02:02 +03:00
IronKing24	dfea73105c	Merge remote-tracking branch 'upstream/HEAD' into platform_compat	2026-07-10 23:33:26 +03:00
Mike Klaas	ef0085dcca	Support Sfall extra animation codes (#535 ) Fixes #534	2026-07-10 12:37:03 -07:00
Mike Klaas	9c19d212a6	Fix blue/green channel mixup in PCX reading (#500 )	2026-07-09 17:43:28 -07:00
jirik2077andgithub-actions[bot]	41d908274f	Handle unimplemented fs_copy/fs_create/fs_find more gracefully in scripts (#530 ) * handle unimplemented fs_copy/fs_create/fs_find more gracefully from the script point of view * chore: auto-format with clang-format * moved to sfall_opcodes --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2026-07-09 20:05:06 +02:00
Mike Klaas	dafb7b3831	Add offset tracking to --scan-unimplemented (#517 ) * Add offset tracking to --scan-unimplemented * Add a bunch of missing opcodes * Hardcode a list of implemented hooks to avoid filtering a long list of hooks that are already done * Add tracking of specific offsets accessed in unsafe scripting so we can plan replacements Sample output ``` OFFSET write_int (0x81d1 - 0x1d1 - 465): 0x5190f8 (5345528): - ./mods/InventoryFilter.dat/scripts/gl_InvenFilter_debug.int - ./mods/InventoryFilter.dat/scripts/release_gl_InvenFilter.int 0x59e95c (5892444): - ./mods/InventoryFilter.dat/scripts/gl_InvenFilter_debug.int - ./mods/InventoryFilter.dat/scripts/release_gl_InvenFilter.int ``` Then we can corrlated it with source: ``` // 0x5190F8 curr_rot static int gInventoryWindowDudeRotation = 0; ``` * PR feedback	2026-07-08 12:31:49 -07:00
IronKing24	dd604b22b6	update the new functions	2026-07-06 14:17:14 +03:00
Mike Klaas	24199e916d	Grow ability for `ce-dat-tool` to extract a list of files (#506 ) * Grow ability for `ce-dat-tool` to extract a list of files This is needed for Et Tu installation, which selectively extracts files from fo1's master.dat. (It doesn't work if everything is extracted) * cache entry list to avoid O(n) cost when extracting many files	2026-07-04 14:58:44 -07:00
Mike Klaas	6ee5d04f7c	Deobfuscate COMBAT_STATE_* bitmask (#524 )	2026-07-04 14:58:16 -07:00
jirik2077	a380a3c9e1	Merge pull request #525 from fallout2-ce/stackable_empty_weapons_fix QoL Stackable empty weapons regardless of the previous ammo type.	2026-07-04 16:39:39 +02:00
jirik2077	c79bf5eb23	move before the ammo/money handling	2026-07-04 06:57:34 +02:00
jirik2077	7290bb4262	added the sameFlags also for empty weapon check	2026-07-04 06:32:15 +02:00
jirik2077	9a84b67ed3	comment typo fix	2026-07-03 22:54:20 +02:00
jirik2077	949458a559	empty weapons of the same type are considered the same even the ammo was originally different	2026-07-03 22:18:08 +02:00
Mike Klaas	2183c3914c	Fix Goris robe/disrobe (#492 ) Currently it isn't playing at all, since we're not doing renderPresent() during the animation loop. This fixes that. Also, it optimizes the time the animation takes by starting it before the interface combat start/end animation. This saves half a second or so. * Remove hidden items when trading with Goris Also, fix the fix to allow looting with Goris	2026-07-02 19:41:16 -07:00
Mike Klaas	c7e187d275	Add art drawing metarules (#507 ) interface_art_draw draw_image{_scaled} art_frame_data	2026-07-02 19:28:14 -07:00
Mike Klaas	2c495a46ca	Update gl_highlighting from sfall (#518 ) * Update gl_highlighting from sfall Pulls in NovaRain's improvement to distinguish empty containers here: https://github.com/sfall-team/sfall/commit/9fa679293269fde377cda1fc97c4668bce741af2x * Pick up sfall fix: https://github.com/sfall-team/sfall/commit/ca3df3347d2776b83bd6edb480b8b4845731af63#diff-c2e89ad914e1b203c22d4003fb6949828e299bf9fbe46ad7ccd5a2476c053b4d	2026-07-02 06:53:05 -07:00
Mike Klaas	2ed355f8ca	Fix initialized variable comparisons and fileReadInt32 (#519 ) * Fix initialized variable comparisons and fileReadInt32 Also pulled in an Sfall fix for this function Fixes https://github.com/fallout2-ce/fallout2-ce/issues/516 * approximate bytes read in xfileRead	2026-07-02 06:52:26 -07:00
Mike Klaas	f3caac0bda	Refactor inventory.cc (#491 ) This adds major simplification and deduplication to inventory.cc, including the start of an "InventoryScroller" class that can manage inventory events without duplicate handling everywhere. This is needed as we add more complexity to the page.	2026-06-29 21:38:38 -07:00
Mike Klaas	fec5df8981	Fix missing argument to format string (#511 ) * Add program->name to scriptError This is @jirik2077 's fix for a segfault, and I agree with the fix. Fixes #509	2026-06-29 20:41:50 -07:00
Mike Klaas	4715e0b349	Add in-game HELP menu (#498 ) Also: fix alignment of skilldex, menu, charset buttons to look visibly depressed.	2026-06-28 22:23:07 -07:00
Mike Klaas	8ce4361365	Windows opcodes (#505 ) * create_win / hide_window * get_window_attributes * get_window_under_mouse * set_window_flag * dialog_message * display_stats	2026-06-28 15:18:06 -07:00
Mike Klaas	2447593e9c	Fix crash due to corrupted `whoHitMe` (#493 ) * Fix crash due to corrupted `whoHitMe` It's possible for some object's `whoHitMe` to contain `-1`. It's supposed to be resolved to `nullptr`, but doesn't reliably happen in all cases, esp outside of combat. The main fix here is to normalize to nullptr when loading the object, instead of just map load, or combat paths. At some point I thought the problem might have been attacker being a non-critter. Added some guards against that regardless. Also, found several bugs and messiness in `apply_damage` which are now fixed. Fixes https://github.com/alexbatalov/fallout2-ce/issues/368	2026-06-24 20:36:55 -07:00
Mike Klaas	26d7b632fc	HOOK_MOVECOST (#496 )	2026-06-17 06:11:08 +00:00
Mike Klaas Copilot Autofix powered by AI github-actions[bot]	c6818f0849	Fix ddraw.ini -> game.cfg migration on unix-y systems (#497 ) * Fix ddraw.ini -> game.cfg migration on unix-y systems We were using `compat_splitpath` on a windows path. We want to work on windows paths, so that's good. This fixes compat_splitpath so that it works with both folder separators. Also tweak `compat_makepath` to recognize both, for consistency. This means that filenames with `\` will be broken, but I think we can (and should) live with that) * Apply suggestions from code review Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * chore: auto-format with clang-format * fix --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2026-06-16 22:48:46 -07:00
Mike Klaas	84cac43da1	HOOK_ITEMDAMAGE (#494 ) * HOOK_ITEMDAMAGE	2026-06-16 22:22:53 -07:00
Mike Klaas	261b54c603	Implement `unwield_slot` (#488 ) * Implement `unwield_slot` This one was surprisingly subtle. Supports many game modes and handles things differently depending on game mode.	2026-06-08 22:25:46 -07:00
Vlad K	46b89abbd8	Merge pull request #490 from fallout2-ce/feature/mapper-edg Mapper EDG support	2026-06-08 23:17:25 +02:00
phobos2077	1ee64988bc	Guard against saving EDG when saving SAV maps in gameplay	2026-06-07 20:53:35 +02:00
Vlad KandCopilot Autofix powered by AI	c78ba885d7	Guard against using dev_path out of mapper Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-06-07 20:44:34 +02:00
Vlad K	8c98a15ef6	sfall: get_ini_config + config cache (#489 ) * sfall: get_ini_config + config cache * Code review fixes and comment standardization	2026-06-06 22:34:37 +00:00
IronKing24	e1426a40c6	pump cmake ios and mac versions	2026-05-29 15:23:15 +03:00
IronKing24	ae6c7aba6e	pump mac & ios version	2026-05-29 14:41:34 +03:00
IronKing24	e5387bef63	Merge branch 'main' into platform_compat	2026-05-26 23:02:04 +03:00
github-actions[bot]	76080a4878	chore: auto-format with clang-format	2026-05-26 14:33:23 +00:00
IronKing24	12314cd5d7	fix includes	2026-05-21 01:52:36 +03:00
IronKing24	a0e1b73116	update compat_access	2026-05-20 21:32:16 +03:00
IronKing24	23c38f60f1	update compat_rename	2026-05-20 21:31:13 +03:00
IronKing24	0c1ecfc3ac	update compat_remove	2026-05-20 21:30:44 +03:00
IronKing24	45676bcc05	update compat_timeGetTime	2026-05-20 21:15:47 +03:00
IronKing24	46152f7e86	update compat_file_exists	2026-05-20 21:15:16 +03:00
IronKing24	b6d1a29411	update compat_mkdir_recursive	2026-05-20 21:14:28 +03:00
IronKing24	6bbd1a48cc	update compat_mkdir	2026-05-20 21:13:47 +03:00
IronKing24	3b7e1d8916	update compat_filelength and header	2026-05-20 21:12:06 +03:00
IronKing24	1f05d0b690	update compat_makepath	2026-05-20 21:10:21 +03:00
IronKing24	444565e8a1	update compat_splitpath	2026-05-20 21:08:46 +03:00