Inventory filter POC

# Conflicts:
#	README.md

CMakeLists.txt

@@ -25,9 +25,6 @@ if(MSVC)
 endif()
 
 option(FALLOUT_VENDORED "Use vendored third-party libraries" ON)
-option(FALLOUT_AUDIO_OGG "Enable OGG decoding with stb_vorbis when available" ON)
-
-set(FALLOUT_STB_VORBIS_DIR "" CACHE PATH "Directory containing stb_vorbis.c")
 
 if(ANDROID)
     add_library(${EXECUTABLE_NAME} SHARED)
@@ -38,15 +35,15 @@ endif()
 # Git Info
 include("cmake/gitver.cmake")
 
-# Shared engine sources — used by both game and mapper targets.
-# Excludes main.cc/main.h (game-only entry logic).
-set(FALLOUT_ENGINE_SOURCES
+target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/actions.cc"
     "src/actions.h"
     "src/animation.cc"
     "src/animation.h"
     "src/art.cc"
     "src/art.h"
+    "src/audio_file.cc"
+    "src/audio_file.h"
     "src/audio.cc"
     "src/audio.h"
     "src/automap.cc"
@@ -154,13 +151,13 @@ set(FALLOUT_ENGINE_SOURCES
     "src/lips.h"
     "src/loadsave.cc"
     "src/loadsave.h"
+    "src/main.cc"
+    "src/main.h"
     "src/mainmenu.cc"
     "src/mainmenu.h"
     "src/map_defs.h"
     "src/map.cc"
     "src/map.h"
-    "src/map_edge.cc"
-    "src/map_edge.h"
     "src/memory_defs.h"
     "src/memory_manager.cc"
     "src/memory_manager.h"
@@ -183,8 +180,6 @@ set(FALLOUT_ENGINE_SOURCES
     "src/obj_types.h"
     "src/object.cc"
     "src/object.h"
-    "src/ogg_decoder.cc"
-    "src/ogg_decoder.h"
     "src/opcode_context.cc"
     "src/opcode_context.h"
     "src/options.cc"
@@ -268,7 +263,7 @@ set(FALLOUT_ENGINE_SOURCES
     "src/xfile.h"
 )
 
-set(FALLOUT_PLATFORM_SOURCES
+target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/audio_engine.cc"
     "src/audio_engine.h"
     "src/delay.cc"
@@ -302,8 +297,6 @@ set(FALLOUT_PLATFORM_SOURCES
     "src/sfall_opcodes.cc"
     "src/sfall_opcodes.h"
     "src/sfall_script_hooks.cc"
-    "src/script_sound.cc"
-    "src/script_sound.h"
     "src/sfall_arrays.cc"
     "src/sfall_arrays.h"
     "src/sfall_animation.cc"
@@ -316,43 +309,8 @@ set(FALLOUT_PLATFORM_SOURCES
 	"third_party/lodepng/lodepng.cpp"
 )
 
-target_sources(${EXECUTABLE_NAME} PUBLIC
-    ${FALLOUT_ENGINE_SOURCES}
-    "src/main.cc"
-    "src/main.h"
-)
-
-target_sources(${EXECUTABLE_NAME} PUBLIC ${FALLOUT_PLATFORM_SOURCES})
-
 target_include_directories(${EXECUTABLE_NAME} PUBLIC "third_party/lodepng")
 
-set(FALLOUT_HAVE_STB_VORBIS OFF)
-if(FALLOUT_AUDIO_OGG)
-    if(EXISTS "${CMAKE_SOURCE_DIR}/third_party/stb_vorbis/stb_vorbis.c")
-        set(_fallout_stb_vorbis_dir "${CMAKE_SOURCE_DIR}/third_party/stb_vorbis")
-    else()
-        set(_fallout_stb_vorbis_dir "${FALLOUT_STB_VORBIS_DIR}")
-        if(NOT _fallout_stb_vorbis_dir)
-            find_path(_fallout_stb_vorbis_dir
-                NAMES "stb_vorbis.c"
-                DOC "Directory containing stb_vorbis.c")
-        endif()
-    endif()
-
-    if(_fallout_stb_vorbis_dir AND EXISTS "${_fallout_stb_vorbis_dir}/stb_vorbis.c")
-        set(FALLOUT_HAVE_STB_VORBIS ON)
-        target_include_directories(${EXECUTABLE_NAME} PRIVATE "${_fallout_stb_vorbis_dir}")
-    else()
-        message(STATUS "OGG support disabled: stb_vorbis.c not found")
-    endif()
-endif()
-
-if(FALLOUT_HAVE_STB_VORBIS)
-    target_compile_definitions(${EXECUTABLE_NAME} PRIVATE HAVE_STB_VORBIS=1)
-else()
-    target_compile_definitions(${EXECUTABLE_NAME} PRIVATE HAVE_STB_VORBIS=0)
-endif()
-
 if(IOS)
     target_sources(${EXECUTABLE_NAME} PUBLIC
         "src/platform/ios/paths.h"
@@ -372,33 +330,14 @@ if(WIN32)
     )
 endif()
 
-if(MINGW)
-     target_compile_definitions(${EXECUTABLE_NAME} PUBLIC
-        _USE_MATH_DEFINES
-    )
-endif()
-
 if(WIN32)
     target_link_libraries(${EXECUTABLE_NAME}
         winmm
-    )
-endif()
-
-if(MSVC)
-    target_link_libraries(${EXECUTABLE_NAME} 
         debug libcpmtd
         optimized libcpmt
     )
 endif()
 
-if(MINGW)
-    target_link_options(${EXECUTABLE_NAME} PRIVATE
-        -static
-        -static-libgcc
-        -static-libstdc++
-    )
-endif()
-
 if(WIN32)
     target_sources(${EXECUTABLE_NAME} PUBLIC
         "os/windows/fallout2-ce.ico"
@@ -515,7 +454,6 @@ target_link_libraries(${EXECUTABLE_NAME} ${ZLIB_LIBRARIES})
 target_include_directories(${EXECUTABLE_NAME} PRIVATE ${ZLIB_INCLUDE_DIRS})
 
 target_link_libraries(${EXECUTABLE_NAME} ${SDL2_LIBRARIES})
-target_link_libraries(${EXECUTABLE_NAME} ${SDL2_MAIN_LIBRARIES})
 target_include_directories(${EXECUTABLE_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})
 
 if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
@@ -542,13 +480,6 @@ if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
     if(WIN32)
         target_link_libraries(ce-dat-tool winmm)
     endif()
-    if(MINGW)
-        target_link_options(ce-dat-tool PRIVATE
-            -static
-            -static-libgcc
-            -static-libstdc++
-        )
-    endif()
     target_include_directories(ce-dat-tool PRIVATE "src")
     target_include_directories(ce-dat-tool PRIVATE ${ZLIB_INCLUDE_DIRS})
     target_include_directories(ce-dat-tool PRIVATE ${SDL2_INCLUDE_DIRS})
@@ -572,14 +503,6 @@ if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
     target_include_directories(ce-frm2png PRIVATE ${ZLIB_INCLUDE_DIRS})
     target_link_libraries(ce-frm2png ${SDL2_LIBRARIES})
     target_link_libraries(ce-frm2png ${ZLIB_LIBRARIES})
-    
-    if(MINGW)
-        target_link_options(ce-frm2png PRIVATE
-            -static
-            -static-libgcc
-            -static-libstdc++
-        )
-    endif()
 
     if(APPLE)
         file(GLOB_RECURSE CE_DAT_INPUTS CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/files/ce.dat/*")
@@ -604,97 +527,6 @@ if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
     endif()
 endif()
 
-if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
-    if(WIN32)
-        add_executable(mapper-ce WIN32)
-    else()
-        add_executable(mapper-ce)
-    endif()
-
-    target_sources(mapper-ce PUBLIC
-        ${FALLOUT_ENGINE_SOURCES}
-        ${FALLOUT_PLATFORM_SOURCES}
-        "src/mapper/map_edge_setup.cc"
-        "src/mapper/map_edge_setup.h"
-        "src/mapper/map_func.cc"
-        "src/mapper/map_func.h"
-        "src/mapper/mapper.cc"
-        "src/mapper/mapper.h"
-        "src/mapper/mp_instance.cc"
-        "src/mapper/mp_instance.h"
-        "src/mapper/mp_proto.cc"
-        "src/mapper/mp_proto.h"
-        "src/mapper/mp_scrpt.cc"
-        "src/mapper/mp_scrpt.h"
-        "src/mapper/mp_targt.cc"
-        "src/mapper/mp_targt.h"
-        "src/mapper/mp_utils.cc"
-        "src/mapper/mp_utils.h"
-        "src/mapper/mp_text.cc"
-        "src/mapper/mp_text.h"
-    )
-
-    target_compile_definitions(mapper-ce PUBLIC FALLOUT_MAPPER)
-
-    if(WIN32)
-        target_compile_definitions(mapper-ce PUBLIC
-            _CRT_SECURE_NO_WARNINGS
-            _CRT_NONSTDC_NO_WARNINGS
-            NOMINMAX
-            WIN32_LEAN_AND_MEAN
-            _STATIC_CPPLIB
-        )
-
-        if(MINGW)
-            target_compile_definitions(mapper-ce PUBLIC
-                _USE_MATH_DEFINES
-            )
-
-            target_link_options(mapper-ce PRIVATE
-                -static
-                -static-libgcc
-                -static-libstdc++
-            )
-        endif()
-
-        target_link_libraries(mapper-ce
-            winmm
-        )
-        
-        if(MSVC)
-            target_link_libraries(mapper-ce
-                debug libcpmtd
-                optimized libcpmt
-            )
-        endif()
-
-        target_sources(mapper-ce PUBLIC
-            "os/windows/fallout2-ce.rc"
-        )
-    endif()
-
-    if(APPLE)
-        target_link_libraries(mapper-ce "-framework CoreFoundation")
-        set_target_properties(mapper-ce PROPERTIES
-            XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO"
-            XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO"
-        )
-    endif()
-
-    target_include_directories(mapper-ce PUBLIC "third_party/lodepng")
-    target_include_directories(mapper-ce PRIVATE "src")
-    target_include_directories(mapper-ce PRIVATE ${ZLIB_INCLUDE_DIRS})
-    target_include_directories(mapper-ce PRIVATE ${SDL2_INCLUDE_DIRS})
-
-    target_link_libraries(mapper-ce
-        fpattern::fpattern
-        fpattern_windows::fpattern_windows
-        ${ZLIB_LIBRARIES}
-        ${SDL2_LIBRARIES}
-        ${SDL2_MAIN_LIBRARIES}
-    )
-endif()
-
 if(APPLE)
     if(IOS)
         install(TARGETS ${EXECUTABLE_NAME} DESTINATION "Payload")

CMakePresets.json

@@ -139,77 +139,6 @@
             "cacheVariables": {
                 "CMAKE_SYSTEM_NAME": "iOS"
             }
-        },
-        {
-            "name": "Mingw-base",
-            "hidden": true,
-            "description": "Base preset for all MinGW builds.",
-            "inherits":[
-                "base"
-            ],
-            "generator": "Ninja",
-            "toolchainFile": "${sourceDir}/cmake/toolchain/mingw.cmake",
-            "cacheVariables": {
-                "CMAKE_SYSTEM_NAME": "Windows"
-            }
-        },
-        {
-            "name": "Mingw-x86-base",
-            "hidden": true,
-            "description": "Base preset for all MinGW x86 builds.",
-            "inherits": [
-                "Mingw-base"
-            ],
-            "cacheVariables": {
-                "CMAKE_C_FLAGS": "-m32",
-                "CMAKE_CXX_FLAGS": "-m32",
-                "CMAKE_SYSTEM_PROCESSOR": "i686"
-            }
-        },
-        {
-            "name": "Mingw-x86-debug",
-            "displayName": "MinGW x86 Debug",
-            "description": "Cross-compile a Debug Windows x86 build with MinGW-w64 and Ninja.",
-            "inherits": [
-                "Mingw-x86-base"
-            ],
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Debug"
-            }
-        },
-        {
-            "name": "Mingw-x86-release",
-            "displayName": "MinGW x86 Release",
-            "description": "Cross-compile a RelWithDebInfo Windows x86 build with MinGW-w64 and Ninja.",
-            "inherits": [
-                "Mingw-x86-debug"
-            ],
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-            }
-        },
-        {
-            "name": "Mingw-x64-debug",
-            "displayName": "MinGW x64 Debug",
-            "description": "Cross-compile a Debug Windows x64 build with MinGW-w64 and Ninja.",
-            "inherits": [
-                "Mingw-base"
-            ],
-            "cacheVariables": {
-                "CMAKE_SYSTEM_PROCESSOR": "x86_64",
-                "CMAKE_BUILD_TYPE": "Debug"
-            }
-        },
-        {
-            "name": "Mingw-x64-release",
-            "displayName": "MinGW x64 Release",
-            "description": "Cross-compile a RelWithDebInfo Windows x64 build with MinGW-w64 and Ninja.",
-            "inherits": [
-                "Mingw-x64-debug"
-            ],
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-            }
         }
     ],
     "buildPresets": [
@@ -268,26 +197,6 @@
             "name": "ios-release",
             "configurePreset": "ios",
             "configuration": "RelWithDebInfo"
-        },
-        {
-            "name": "Mingw-x86-Debug",
-            "displayName": "MinGW x86 Debug",
-            "configurePreset": "Mingw-x86-debug"
-        },
-        {
-            "name": "Mingw-x86-Release",
-            "displayName": "MinGW x86 Release",
-            "configurePreset": "Mingw-x86-release"
-        },
-        {
-            "name": "Mingw-x64-Debug",
-            "displayName": "MinGW x64 Debug",
-            "configurePreset": "Mingw-x64-debug"
-        },
-        {
-            "name": "Mingw-x64-Release",
-            "displayName": "MinGW x64 Release",
-            "configurePreset": "Mingw-x64-release"
         }
     ]
 }

CONTRIBUTING.md

@@ -66,9 +66,8 @@ 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> 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>`
+4. `ce-dat-tool <archive.dat> cat <entry>`
+5. `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:
@@ -77,7 +76,7 @@ For example:
 
 ## `ce-frm2png` CLI Tool
 
-There is also a small FRM conversion tool in this repo for converting Fallout art between `.frm` and `.png`.
+There is also a small FRM conversion tool in this repo for exporting Fallout `.frm` art to `.png`.
 
 From the repo root, build it with your normal CMake workflow, targeting `ce-frm2png`:
 
@@ -90,26 +89,18 @@ Basic usage:
 1. `./<BUILD_DIR>/ce-frm2png <input.frm> [output.png]`
 2. `./<BUILD_DIR>/ce-frm2png <input.frm> [output.png] --palette <path-to-color.pal>`
 3. `./<BUILD_DIR>/ce-frm2png <input.frm> [output.png] --frame <index> --direction <index>`
-4. `./<BUILD_DIR>/ce-frm2png <input.png> [output.frm] --palette <path-to-color.pal>`
-5. `./<BUILD_DIR>/ce-frm2png <input.png> [output.frm] --fps 10 --action-frame 0 --x-offset 0 --y-offset 0`
-6. `./<BUILD_DIR>/ce-frm2png <input.png> <output.png> --palette <path-to-color.pal>`
-7. `./<BUILD_DIR>/ce-frm2png - [output.png|-] --from-frm --palette <path-to-color.pal>`
-8. `./<BUILD_DIR>/ce-frm2png - [output.frm|-] --from-png --palette <path-to-color.pal>`
+4. `./<BUILD_DIR>/ce-frm2png - [output.png|-] --palette <path-to-color.pal>`
 
-`-` can be used to take input from stdin (e.g. from `ce-dat-tool cat`) or write to stdout. When reading from stdin, pass `--from-frm` or `--from-png`. Output defaults to PNG for FRM input and FRM for PNG input when output is omitted or `-`; use `--to-png` for PNG output to stdout from PNG input.
+`-` can be used to take input from stdin (e.g. from `ce-dat-tool cat` or write to stdout).
 
-Output file extensions are validated against the selected conversion. For example, PNG-to-FRM output must use `.frm`, and PNG output must use `.png`.
-
-If `--palette` isn't specified, it will pick up `color.pal` in the input file's directory or cwd.
+If `--palette` isn't specified, it will pick up `color.pal` in the .frm's directory or cwd.
 
 Notes:
 
 - The tool expects a raw `color.pal` file. It does not read palettes directly from `master.dat`, so extract `color.pal` first if needed.
 - A typical extraction flow is: `ce-dat-tool master.dat extract --lower . 'color.pal'`
 - By default palette index `0` becomes transparent in the output PNG. Pass `--opaque` to keep it opaque.
-- PNG output is always palette-indexed and preserves Fallout palette indices when possible.
-- For `png -> frm`, transparent pixels (alpha below 128) map to palette index `0` by default. Pass `--opaque` to quantize every pixel instead.
-- The current `png -> frm` implementation writes a single-frame FRM and points all six direction slots at the same frame payload.
+- The current implementation writes RGBA PNGs. It does not preserve the original Fallout palette indices as a palette-indexed PNG.
 
 ## Updating SDL
 

README.md

@@ -105,13 +105,13 @@ docker run --rm -v $(pwd):/src emscripten/emsdk:3.1.74 sh -c 'git config --globa
 
 ## 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 main configuration file is `fallout2-ce.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-ce.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.
+Additional settings for screen resolution, UI customization, and map options are now integrated into the main `fallout2-ce.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 main config. After that, `fallout2-ce.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.
+Here are some important settings in `fallout2-ce.cfg` under the `[screen]` and `[ui]` sections.  See [the example config](https://github.com/fallout2-ce/fallout2-ce/tree/refs/heads/main/files/ce.cfg) for a full list of settings.
 
 ```ini
 [screen]
@@ -143,17 +143,13 @@ In time this stuff will receive in-game interface, right now you have to do it m
 * 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, and use accurate path length for walk vs run
+* 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, and for `Take All` when looting
-* When bartering, caps default to the right amount to balance the trade
+* _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
-* 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))
 
 ## Contributing
 
@@ -163,14 +159,6 @@ Integrating Sfall goodies is the top priority. Quality of life updates are OK to
 
 For current sfall compatibility status and the remaining work needed to close gaps, see [SFALL_COMPATIBILITY.md](SFALL_COMPATIBILITY.md).
 
-## For modders
-
-* Robust (though not 100%) Sfall opcode and hook support
-* .ogg/.wav support for map music
-* .png support for static assets (must be 8bit indexed)
-* .zip support for .dat archives
-* Working BIS mapper
-
 ## License
 
 The source code is this repository is available under the [Sustainable Use License](LICENSE.md).

SFALL_COMPATIBILITY.md

@@ -4,25 +4,13 @@ This document tracks Fallout 2 CE compatibility with sfall.  This is for modders
 
 For now, this covers opcodes/metarules, and hooks.  In the future, it will include other ways of modifying the engine (like ini files), and other Sfall-specific behaviour.
 
-## HRP EDG Scroll-Blocker Support
-
-CE supports the `.edg` file format from the HRP (High Resolution Patch), which defines per-map scroll boundaries and square-level render clipping.
-
-**How it works in CE:**
-
-- On map load, `maps/<mapname>.edg` is read if present. Missing file = silent fallback to the scroll-blocker object system.
-- The `.edg` file defines per-elevation rectangle boundary zones. Multiple chained zones per elevation are supported.
-- When loaded, these zones are used for both scroll blocking and visible area clipping (black bars), replacing both vanilla scroll blocking and CE hi-res stencil system.
-- v2 EDG files also contain a `SquareRect` that defines "Angled edges", or square-grid stencil. This is also supported.
-
-
 ## Settings (ddraw.ini → fallout2.cfg / game.cfg)
 
 Settings previously read from `ddraw.ini` have been moved into standard CE config files.
 
 Most settings that control game behavior (premade characters, extra message files, combat tweaks, worldmap, etc.) have been moved into [`<DAT>/config/game.cfg`](files/ce.dat/config/game.cfg), which is a content-mod config file intended to be overridden by mods. See that file for the full list with descriptions.
 
-The following settings were moved into [`fallout2.cfg`](files/fallout2.cfg) instead:
+The following settings were moved into [`fallout2-ce.cfg`](files/ce.cfg) instead:
 
 | ddraw.ini section | ddraw.ini key | fallout2.cfg section | fallout2.cfg key |
 | --- | --- | --- | --- |
@@ -53,9 +41,9 @@ 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{_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<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. |
+| Audio | eax_available<br>set_eax_environment<br>play_sfall_sound<br>stop_sfall_sound | not implemented | *eax* opcodes will not be implemented |
 | Combat / Weapons and ammo | get/set_weapon_ammo_pid<br>get/set_weapon_ammo_count | ✅ | - |
 | Sfall / Version | sfall_ver_major<br>sfall_ver_minor<br>sfall_ver_build | ✅ | CE currently reports `4.3.4` |
 | Utility / Math | log, exponent, round, sqrt, abs, sin, cos, tan, arctan, ceil, ^, floor2, div | ✅ | - |
@@ -63,32 +51,30 @@ 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>art_frame_data<br>refresh_pc_art<br>art_cache_clear | ✅ | - |
+| Art and appearance | art_exists<br>refresh_pc_art<br>art_cache_clear<br>set_hero_race<br>set_hero_style | implemented: art_exists, refresh_pc_art, art_cache_clear | - |
 | Tiles and paths | get_tile_fid<br>tile_under_cursor<br>tile_light<br>tile_get_objs<br>tile_refresh_display<br>obj_blocking_tile<br>tile_by_position<br>get_tile_ground_fid<br>get_tile_roof_fid<br>obj_blocking_line<br>path_find_to<br>objects_in_radius | ✅ | - |
 | Utility | sprintf<br>typeof<br>atoi<br>atof | ✅ | - |
 | Utility / Strings | string_split<br>substr<br>strlen<br>charcode<br>get_string_pointer<br>string_find<br>string_find_from<br>string_format<br>string_format_array<br>string_replace<br>string_to_case<br>string_compare | ✅ | `get_string_pointer` is deprecated and intentionally omitted. |
-| Interface / Tags | show_iface_tag<br>hide_iface_tag<br>is_iface_tag_active<br>set_iface_tag_text<br>add_iface_tag | ✅ | Legacy `BoxBarCount`, `BoxBarColors` ddraw.ini settings not supported. |
+| Interface / Tags | show_iface_tag<br>hide_iface_tag<br>is_iface_tag_active<br>set_iface_tag_text<br>add_iface_tag | ✅ except set_iface_tag_text, add_iface_tag | CE only handles built-in interface tags here; custom tag creation/text is not supported yet. |
 | Global variables | set_sfall_global<br>get_sfall_global_int<br>get_sfall_global_float | ✅ except get_sfall_global_float | Current CE storage is int-backed; `set_sfall_global` stores integer values |
 | Hooks / Hook functions | init_hook<br>get_sfall_arg<br>get_sfall_args<br>get_sfall_arg_at<br>set_sfall_return<br>set_sfall_arg<br>register_hook<br>register_hook_proc<br>register_hook_proc_spec | ✅ | See below for implemented hooks. `init_hook` is deprecated and will not be implemented. register_hook_proc and register_hook_proc_spec both add hooks to the *end* of the hook list, instead of beginning and end, respectively. |
-| Arrays / Array functions | create_array<br>temp_array<br>fix_array<br>get/set_array<br>resize_array<br>free_array<br>scan_array<br>len_array<br>save/load_array<br>array_key<br>arrayexpr | ✅ | - |
+| Arrays / Array functions | create_array<br>temp_array<br>fix_array<br>get/set_array<br>resize_array<br>free_array<br>scan_array<br>len_array<br>save/load_array<br>array_key<br>arrayexpr | ✅ except save_array, load_array | - |
 | Perks and traits / NPC perks | set_fake_perk_npc<br>set_fake_trait_npc<br>set_selectable_perk_npc<br>has_fake_perk_npc<br>has_fake_trait_npc | not implemented | - |
 | Global scripts / Global script functions | set_global_script_repeat<br>set_global_script_type<br>available_global_script_types | ✅ except available_global_script_types | - |
-| Combat | attack_is_aimed<br>block_combat<br>force_aimed_shots<br>disable_aimed_shots<br>get_attack_type<br>get/set_bodypart_hit_modifier<br>combat_data<br>get/set/reset_critical_table<br>get_last_target<br>get_last_attacker<br>set_critter_burst_disable<br>get/set_critter_current_ap<br>set_spray_settings<br>get/set_combat_free_move | ✅ except block_combat, force_aimed_shots, disable_aimed_shots, get_last_target, get_last_attacker, set_spray_settings | - |
+| Combat | attack_is_aimed<br>block_combat<br>force_aimed_shots<br>disable_aimed_shots<br>get_attack_type<br>get/set_bodypart_hit_modifier<br>combat_data<br>get/set/reset_critical_table<br>get_last_target<br>get_last_attacker<br>set_critter_burst_disable<br>get/set_critter_current_ap<br>set_spray_settings<br>get/set_combat_free_move | implemented: get_attack_type, get/set_bodypart_hit_modifier, combat_data, get/set_critter_current_ap, get/set_combat_free_move | - |
 | Car | set_car_current_town<br>car_gas_amount<br>set_car_intface_art | implemented: all except set_car_intface_art | - |
-| Interface / Windows and images | 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 / Windows and images | art_frame_data<br>interface_art_draw<br>interface_print<br>draw_image<br>draw_image_scaled<br>get_window_under_mouse<br>create_win<br>get_window_attribute<br>message_box<br>set_window_flag<br>win_fill_color<br>interface_overlay<br>dialog_message<br>get_text_width<br>hide_window<br>show_window<br>create_message_window | implemented: only message_box, get_text_width, show_window, create_message_window | - |
 | Interface / Outline | outlined_object<br>get_outline<br>set_outline | ✅ | - |
 | Interface / Main interface | intface_is_hidden<br>intface_redraw<br>intface_hide<br>intface_show<br>set_quest_failure_value | implemented: only intface_redraw | `intface_redraw` only supports the zero-argument form; the optional-argument path is explicitly unimplemented. |
-| Interface / Inventory | display_stats<br>inventory_redraw<br>critter_inven_obj2<br>get_current_inven_size<br>item_weight | ✅ except get_current_inven_size | - |
+| Interface / Inventory | display_stats<br>inventory_redraw<br>critter_inven_obj2<br>get_current_inven_size<br>item_weight | implemented: critter_inven_obj2, item_weight | - |
 | Interface / Cursor | get/set_cursor_mode | ✅ | - |
 | Locks | lock_is_jammed<br>unjam_lock<br>set_unjam_locks_time | not implemented | - |
-| INI settings | get_ini_setting<br>get_ini_string<br>get_ini_section<br>get_ini_sections<br>get_ini_config<br>get_ini_config_db<br>set_ini_setting | ✅ | `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, real_dude_obj, 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 | get_object_data assumes raw memory offsets which may return different values in CE |
+| INI settings | get_ini_setting<br>get_ini_string<br>get_ini_section<br>get_ini_sections<br>get_ini_config<br>get_ini_config_db<br>set_ini_setting | ✅ except get_ini_config, get_ini_config_db | `modified_ini` is intentionally omitted as deprecated. |
+| Objects and scripts | set_self<br>set_dude_obj<br>real_dude_obj<br>remove_script<br>get/set_script<br>obj_is_carrying_obj<br>loot_obj<br>dialog_obj<br>obj_under_cursor<br>get/set_object_data<br>get/set_flags<br>set_unique_id<br>set_scr_name<br>obj_is_openable<br>get/set_proto_data<br>get_object_ai_data | implemented: set_self, get/set/remove_script, obj_is_carrying_obj, loot_obj, dialog_obj, obj_under_cursor, get_object_data, get_flags, set_flags, obj_is_openable, get_proto_data, set_proto_data | - |
 | Other / Game management | set_movie_path<br>stop/resume_game<br>mark_movie_played<br>game_loaded<br>get_game_mode<br>get_uptime<br>signal_close_game | implemented: game_loaded, get_game_mode, get_uptime, signal_close_game | - |
-| Gameplay tweaks | set_pickpocket_max<br>set_hit_chance_max<br>set_xp_mod<br>set_critter_hit_chance_mod<br>set_base_hit_chance_mod<br>set_hp_per_level_mod<br>gdialog_get_barter_mod<br>get/set_unspent_ap_bonus<br>get/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 | - |
+| Gameplay tweaks | set_pickpocket_max<br>set_hit_chance_max<br>set_xp_mod<br>set_critter_hit_chance_mod<br>set_base_hit_chance_mod<br>set_hp_per_level_mod<br>gdialog_get_barter_mod<br>get/set_unspent_ap_bonus<br>get/<br>set_base_pickpocket_mod<br>set_critter_pickpocket_mod<br>get/set_inven_ap_cost<br>set_drugs_data<br>get_kill_counter<br>mod_kill_counter<br>set_pipboy_available | implemented: gdialog_get_barter_mod | - |
 | NPCs | inc_npc_level<br>get_npc_level<br>npc_engine_level_up | not implemented | - |
-| 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. |
+| Other | get_year<br>set_dm/df_model<br>active_hand<br>toggle_active_hand<br>get/set_viewport_x/y<br>hero_select_win<br>get_light_level<br>message_str_game<br>sneak_success<br>create_spatial<br>unwield_slot<br>add_g_timer_event<br>add_extra_msg_file<br>get_metarule_table<br>metarule_exist<br>remove_timer_event<br>spatial_radius | implemented: get_year, active_hand, toggle_active_hand, get_light_level, message_str_game, add_extra_msg_file, metarule_exist | `input_funcs_available`, `nb_create_char` are deprecated in sfall and intentionally absent in CE. `add_extra_msg_file` does not support the explicit `fileNumber` form in CE. |
 
 ## Hooks
 
@@ -106,17 +92,17 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
 | UseObj | `HOOK_USEOBJ` | ✅ | CE notes an sfall-matching inconsistency around return code `2` behavior between interface contexts. |
 | RemoveInvenObj | `HOOK_REMOVEINVENOBJ` | 🚫 | - |
 | BarterPrice | `HOOK_BARTERPRICE` | ✅ | - |
-| ItemDamage | `HOOK_ITEMDAMAGE` | ✅ | - |
-| MoveCost | `HOOK_MOVECOST` | ✅ | - |
+| MoveCost | `HOOK_MOVECOST` | 🚫 | - |
+| ItemDamage | `HOOK_ITEMDAMAGE` | 🚫 | - |
 | 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` | ✅ | - |
-| UseSkill | `HOOK_USESKILL` | ✅ | - |
-| Steal | `HOOK_STEAL` | ✅ | - |
+| UseSkill | `HOOK_USESKILL` | 🚫 | - |
+| Steal | `HOOK_STEAL` | 🚫 | Et tu |
 | WithinPerception | `HOOK_WITHINPERCEPTION` | ✅ | - |
 | InventoryMove | `HOOK_INVENTORYMOVE` | ✅ | - |
-| InvenWield | `HOOK_INVENWIELD` | ✅ | - |
-| AdjustFID | `HOOK_ADJUSTFID` | ✅ | Second hook arg currently matches the first because CE has no internal FID modifiers like Hero Appearance. |
+| InvenWield | `HOOK_INVENWIELD` | 🚫 | - |
+| AdjustFID | `HOOK_ADJUSTFID` | 🚫 | - |
 | CombatTurn | `HOOK_COMBATTURN` | ✅ | - |
 | StdProcedure | `HOOK_STDPROCEDURE` | ✅ | - |
 | StdProcedureEnd | `HOOK_STDPROCEDURE_END` | ✅ | - |
@@ -127,16 +113,16 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
 | UseAnimObj | `HOOK_USEANIMOBJ` | 🚫 | Et tu; (maybe) |
 | ExplosiveTimer | `HOOK_EXPLOSIVETIMER` | ✅ | - |
 | DescriptionObj | `HOOK_DESCRIPTIONOBJ` | 🚫 | Et tu |
-| UseSkillOn | `HOOK_USESKILLON` | ✅ | - |
+| UseSkillOn | `HOOK_USESKILLON` | 🚫 | Et tu |
 | OnExplosion | `HOOK_ONEXPLOSION` | 🚫 | (maybe) |
 | SubCombatDamage | `HOOK_SUBCOMBATDAMAGE` | 🚫 | (maybe) |
 | SetLighting | `HOOK_SETLIGHTING` | 🚫 | Et tu; (maybe) |
 | Sneak | `HOOK_SNEAK` | 🚫 | - |
 | TargetObject | `HOOK_TARGETOBJECT` | 🚫 | (maybe) |
-| Encounter | `HOOK_ENCOUNTER` | ✅ | - |
+| Encounter | `HOOK_ENCOUNTER` | 🚫 | Et tu |
 | AdjustPoison | `HOOK_ADJUSTPOISON` | 🚫 | (maybe) |
 | AdjustRads | `HOOK_ADJUSTRADS` | 🚫 | (maybe) |
 | RollCheck | `HOOK_ROLLCHECK` | 🚫 | - |
 | BestWeapon | `HOOK_BESTWEAPON` | 🚫 | - |
-| CanUseWeapon | `HOOK_CANUSEWEAPON` | ✅ | - |
+| CanUseWeapon | `HOOK_CANUSEWEAPON` | 🚫 | - |
 | BuildSfxWeapon | `HOOK_BUILDSFXWEAPON` | 🚫 | - |

cmake/toolchain/mingw.cmake

@@ -1,18 +0,0 @@
-# specify the cross compiler
-set(CMAKE_C_COMPILER ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc)
-set(CMAKE_CXX_COMPILER ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-g++)
-set(CMAKE_RC_COMPILER ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-windres)
-
-# where is the target environment
-set(CMAKE_FIND_ROOT_PATH /usr/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32)
-
-# search for programs in the build host directories
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# for libraries and headers in the target directories
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-# CMake determines how to examine dependencies based on the *host* system, leading to
-# a `file unknown error` unless the target platform is explicitly specified.
-set(CMAKE_GET_RUNTIME_DEPENDENCIES_PLATFORM "windows+pe")

files/ce.cfg

@@ -22,10 +22,6 @@ save_text_maps=0
 show_pid_numbers=0
 sort_script_list=0
 use_art_not_protos=0
-; Allows to load a certain map right away after loading the mapper.
-map=denbus2
-; Allows to disable grid item picker and use a simpler list-based picker.
-use_grid_item_picker=1
 
 [preferences]
 brightness=1.000000
@@ -98,8 +94,6 @@ auto_quick_save=3
 display_bonus_damage=1
 ;Set to 1 to get notification of karma changes in the notification window
 display_karma_changes=0
-;Set to 1 to use the hi-res dialog border/background at resolutions above 640x480. Requires art\intrface\HR_ALLTLK.FRM (for example from f2_res.dat)
-dialog_border=1
 ;Set to one to hide areas outside map bounds when using higher than 640x480 resolution, and to zero to disable
 enable_high_resolution_stencil=1
 ;Set to 1 to extend the action points bar to show up to 16 AP instead of 10 (requires iface_apbar_e.frm)
@@ -110,8 +104,6 @@ iface_bar_mode=0
 iface_bar_side_art=2
 iface_bar_sides_ori=0
 iface_bar_width=800
-;Whether to load EDG files (HRP format) when loading maps. If loaded, they override default edge clipping and scroll blocking behavior.
-edg_support=1
 ignore_map_edges=0
 ;Set to 1 to display numbered dialogue options
 numbers_in_dialogue=0
@@ -119,28 +111,12 @@ numbers_in_dialogue=0
 ;Set to 2 to also skip the splash screen
 skip_opening_movies=0
 splash_screen_size=1
-;Set to 1 to scale movies to fit the screen while preserving aspect ratio.
-;Set to 0 to keep movies at their native size, centered on screen.
-movie_aspect_fit=1
 ;Maximum number of columns shown in the main inventory and loot/steal windows (valid range: 1..2)
 ;2-column Loot/steal window requires minimum screen width of 673px
 inventory_columns=2
 
-;Set to 0 to keep the main menu art and controls at native size.
-;Set to 1 to scale only the main menu background image to fit the screen while maintaining aspect ratio.
-;Set to 2 to also scale the main menu button panel, red buttons, and button labels with the menu art.
-main_menu_scale_mode=1
-;Set to 1 to show a Help option in the in-game options menu which opens the F1 help screen.
-in_game_menu_help=1
-
-
 [qol]
 ; Automatically open doors that are unlocked and has no script attached.
 auto_open_doors=0
-; Overrides distance at which walk animation is used when using an object.  0 disables walking
-; This is the number of empty tiles between the player and the target
-use_walk_distance=3
-; Allow opening party member inventory from the long-press world menu.
-party_trade_from_menu=1
-; Allow switching to companions' inventories in loot screens (and barter, in the future)
-party_loot_and_barter=1
+; Overrides distance at which walk animation is used when using an object.
+use_walk_distance=5

files/ce.dat/text/english/game/ce.msg

@@ -1 +0,0 @@
-{0}{}{HELP}

files/ce.dat/text/french/game/ce.msg

@@ -1 +0,0 @@
-{0}{}{AIDE}

files/ce.dat/text/german/game/ce.msg

@@ -1 +0,0 @@
-{0}{}{HILFE}

files/ce.dat/text/italian/game/ce.msg

@@ -1 +0,0 @@
-{0}{}{AIUTO}

files/ce.dat/text/polish/game/ce.msg

@@ -1 +0,0 @@
-{0}{}{POMOC}