chore: auto-format with clang-format

* 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>

SFALL_COMPATIBILITY.md

@@ -75,18 +75,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 | 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 | ✅ except interface_print, draw_image, draw_image_scaled, 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. |
+| 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, 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 | - |
 | 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 Appearange | set_dm/df_model<br>hero_select_win | 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
 
@@ -104,8 +106,8 @@ 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` | ✅ | - |
-| 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` | ✅ | - |

sfall_testing/gl_test_ini.ssl

@@ -65,6 +65,12 @@ procedure ini_test_suite begin
     call assertEquals("TC7 get_ini_sections size", len_array(result_array), 3);
     call assertTrue("TC7 get_ini_sections", scan_array(result_array, "TestMisc") >= 0);
 
+    // get_ini_config
+    result_array := get_ini_config_db("config\\config_from_db.cfg");
+    call assertEquals("TC8 get_ini_config_db size", len_array(result_array), 2);
+    call assertTrue("TC8 get_ini_config ValidSection", result_array.ValidSection != 0);
+    call assertEquals("TC8 get_ini_config_db ValidValue", result_array.ValidSection.ValidKey, "ValidValue");
+
     call report_test_results("ini");
 end
 

sfall_testing/gl_test_unwield_slot.ssl

@@ -0,0 +1,43 @@
+#include "sfall.h"
+#include "dik.h"
+#include "define_lite.h"
+#include "define_extra.h"
+#include "test_utils.h"
+
+procedure run_unwield_slot_test(variable slot, variable slotName) begin
+    variable equippedItem := critter_inven_obj2(dude_obj, slot);
+
+    if (equippedItem == 0) then begin
+        display_msg("unwield_slot " + slotName + ": slot is empty");
+        return;
+    end
+
+    unwield_slot(dude_obj, slot);
+
+    call assertTrue("unwield_slot clears " + slotName + " slot", critter_inven_obj2(dude_obj, slot) == 0);
+    call report_test_results("unwield_slot");
+end
+
+procedure keypress_handler begin
+    variable pressed := get_sfall_arg_at(0);
+    variable key := get_sfall_arg_at(1);
+
+    if (not pressed) then return;
+
+    if (key == DIK_J) then begin
+        call run_unwield_slot_test(INVEN_TYPE_WORN, "armor");
+    end else if (key == DIK_K) then begin
+        call run_unwield_slot_test(INVEN_TYPE_RIGHT_HAND, "right");
+    end else if (key == DIK_L) then begin
+        call run_unwield_slot_test(INVEN_TYPE_LEFT_HAND, "left");
+    end
+end
+
+procedure start begin
+    if (not game_loaded) then return;
+
+    call assertEquals("unwield_slot metarule exists", metarule_exist("unwield_slot"), 1);
+    call assertEquals("critter_inven_obj2 metarule exists", metarule_exist("critter_inven_obj2"), 1);
+    display_msg("unwield_slot manual test ready: open inventory or barter, then press J armor, K right, L left");
+    register_hook_proc(HOOK_KEYPRESS, keypress_handler);
+end

sfall_testing/hooks/gl_itemdamage.ssl

@@ -0,0 +1,98 @@
+#include "sfall.h"
+#include "dik.h"
+#include "lib.arrays.h"
+#include "../test_utils.h"
+
+variable itemdamage_mode := 0;
+variable itemdamage_seen := 0;
+variable itemdamage_last_min := 0;
+variable itemdamage_last_max := 0;
+variable itemdamage_last_hit_mode := 0;
+variable itemdamage_last_is_melee_weapon := 0;
+variable itemdamage_last_weapon_pid := -1;
+variable itemdamage_last_weapon_name := "<none>";
+
+procedure itemdamage_mode_name begin
+    if (itemdamage_mode == 1) then return "fixed-42";
+    if (itemdamage_mode == 2) then return "range-30-30";
+    return "engine";
+end
+
+procedure itemdamage_weapon_name(variable weapon) begin
+    if (weapon == 0) then return "<unarmed>";
+    return obj_name(weapon);
+end
+
+procedure itemdamage_handler begin
+    variable
+        args := get_sfall_args,
+        weapon := args[2];
+
+    call assertEquals("itemdamage arg count", len_array(args), 6);
+    call assertTrue("itemdamage min <= max", args[0] <= args[1]);
+    call assertTrue("itemdamage melee flag", args[5] == 0 or args[5] == 1);
+
+    itemdamage_seen := itemdamage_seen + 1;
+    itemdamage_last_min := args[0];
+    itemdamage_last_max := args[1];
+    itemdamage_last_hit_mode := args[4];
+    itemdamage_last_is_melee_weapon := args[5];
+    itemdamage_last_weapon_name := itemdamage_weapon_name(weapon);
+
+    if (weapon == 0) then
+        itemdamage_last_weapon_pid := -1;
+    else
+        itemdamage_last_weapon_pid := obj_pid(weapon);
+
+    display_msg(string_format6("itemdamage mode=%s min=%d max=%d weapon=%s hit=%d melee=%d",
+        itemdamage_mode_name,
+        args[0],
+        args[1],
+        itemdamage_last_weapon_name,
+        itemdamage_last_hit_mode,
+        itemdamage_last_is_melee_weapon));
+
+    if (itemdamage_mode == 1) then begin
+        set_sfall_return(42);
+    end else if (itemdamage_mode == 2) then begin
+        set_sfall_return(30);
+        set_sfall_return(30);
+    end
+end
+
+procedure keypress_handler begin
+    variable
+        pressed := get_sfall_arg_at(0),
+        key := get_sfall_arg_at(1);
+
+    if (not pressed) then return;
+
+    if (key == DIK_J) then begin
+        itemdamage_mode := itemdamage_mode + 1;
+        if (itemdamage_mode > 2) then itemdamage_mode := 0;
+        display_msg(string_format1("itemdamage mode -> %s", itemdamage_mode_name));
+    end else if (key == DIK_K) then begin
+        display_msg(string_format7("itemdamage summary mode=%s seen=%d last=%d-%d weapon=%s pid=%d melee=%d",
+            itemdamage_mode_name,
+            itemdamage_seen,
+            itemdamage_last_min,
+            itemdamage_last_max,
+            itemdamage_last_weapon_name,
+            itemdamage_last_weapon_pid,
+            itemdamage_last_is_melee_weapon));
+        call assertTrue("itemdamage observed", itemdamage_seen > 0);
+        call report_test_results("itemdamage");
+    end
+end
+
+procedure start begin
+    if (not game_loaded) then return;
+
+    display_msg("itemdamage manual test ready:");
+    display_msg("press J to cycle engine/fixed-42/range-30-30");
+    display_msg("attack with fists, melee weapons, and ranged weapons");
+    display_msg("press K to report after HOOK_ITEMDAMAGE fires");
+
+    register_hook_proc(HOOK_KEYPRESS, keypress_handler);
+    register_hook_proc(HOOK_ITEMDAMAGE, itemdamage_handler);
+end

sfall_testing/hooks/gl_movecost.ssl

@@ -0,0 +1,70 @@
+#include "sfall.h"
+#include "dik.h"
+
+variable movecost_mode := 0;
+
+procedure movecost_mode_name(variable mode) begin
+    variable name := "unknown";
+
+    if (mode == 0) then name := "engine";
+    else if (mode == 1) then name := "plus_per_hex";
+    else if (mode == 2) then name := "double";
+
+    return name;
+end
+
+procedure cycle_movecost_mode begin
+    if (movecost_mode == 0) then movecost_mode := 1;
+    else if (movecost_mode == 1) then movecost_mode := 2;
+    else movecost_mode := 0;
+
+    display_msg(string_format1("movecost mode=%s", movecost_mode_name(movecost_mode)));
+end
+
+procedure movecost_handler begin
+    variable
+        args := get_sfall_args,
+        critter := args[0],
+        distance := args[1],
+        defaultCost := args[2],
+        modeName := movecost_mode_name(movecost_mode),
+        newCost := defaultCost;
+
+    if (critter != dude_obj) then return;
+
+    display_msg(string_format3("movecost dist=%d default=%d mode=%s",
+        distance,
+        defaultCost,
+        modeName));
+
+    if (movecost_mode == 1) then begin
+        newCost := defaultCost + distance;
+    end else if (movecost_mode == 2) then begin
+        newCost := defaultCost * 2;
+    end else begin
+        return;
+    end
+
+    set_sfall_return(newCost);
+end
+
+procedure keypress_handler begin
+    variable
+        pressed := get_sfall_arg_at(0),
+        key := get_sfall_arg_at(1);
+
+    if (not pressed) then return;
+    if (key != DIK_M) then return;
+
+    call cycle_movecost_mode;
+end
+
+procedure start begin
+    if (not game_loaded) then return;
+
+    display_msg("movecost manual test ready: enter combat, hover a tile, then move");
+    display_msg("press M to cycle hook override: engine -> plus_per_hex -> double");
+
+    register_hook_proc(HOOK_KEYPRESS, keypress_handler);
+    register_hook_proc(HOOK_MOVECOST, movecost_handler);
+end

sfall_testing/test_mod_data/config/config_from_db.cfg

@@ -0,0 +1,7 @@
+[ValidSection]
+ValidKey=ValidValue
+Key2=2
+
+[Section2]
+Key1=AA
+Key2=BB

sfall_testing/test_mod_data/readme.md

@@ -0,0 +1,2 @@
+A test mod for sfall scripting features testing.
+Add it to your mods_order.txt

sfall_testing/test_mod_data/scripts/readme.md

@@ -0,0 +1 @@
+Put compiled scripts in here

src/art.cc

@@ -10,6 +10,7 @@
 
 #include "animation.h"
 #include "content_config.h"
+#include "datafile.h"
 #include "debug.h"
 #include "draw.h"
 #include "game.h"
@@ -524,34 +525,6 @@ unsigned char* artLockFrameData(int fid, int frame, int direction, CacheEntry**
     return nullptr;
 }
 
-// 0x4191CC
-unsigned char* artLockFrameDataReturningSize(int fid, CacheEntry** handlePtr, int* widthPtr, int* heightPtr)
-{
-    *handlePtr = nullptr;
-
-    Art* art = nullptr;
-    cacheLock(&gArtCache, fid, (void**)&art, handlePtr);
-
-    if (art == nullptr) {
-        return nullptr;
-    }
-
-    // NOTE: Uninline.
-    *widthPtr = artGetWidth(art, 0, 0);
-    if (*widthPtr == -1) {
-        return nullptr;
-    }
-
-    // NOTE: Uninline.
-    *heightPtr = artGetHeight(art, 0, 0);
-    if (*heightPtr == -1) {
-        return nullptr;
-    }
-
-    // NOTE: Uninline.
-    return artGetFrameData(art, 0, 0);
-}
-
 // 0x419260
 int artUnlock(CacheEntry* handle)
 {
@@ -1221,6 +1194,51 @@ static bool artIndexedPngHasSupportedTransparency(const LodePNGColorMode& color)
     return true;
 }
 
+static Art* artAllocateSingleFrame(int width, int height, unsigned char** frameDataPtr)
+{
+    if (width <= 0 || height <= 0 || width > SHRT_MAX || height > SHRT_MAX) {
+        return nullptr;
+    }
+
+    size_t pixelCount = static_cast<size_t>(width) * static_cast<size_t>(height);
+    if (pixelCount > kMaxNamedPngPixels || pixelCount > INT_MAX) {
+        return nullptr;
+    }
+
+    Art header = {};
+    header.version = 4;
+    header.framesPerSecond = 10;
+    header.actionFrame = 0;
+    header.frameCount = 1;
+    header.dataSize = sizeof(ArtFrame) + static_cast<int>(pixelCount);
+
+    int currentPadding = paddingForSize(sizeof(Art));
+    for (int rotation = 0; rotation < ROTATION_COUNT; rotation++) {
+        header.dataOffsets[rotation] = 0;
+        header.padding[rotation] = currentPadding;
+    }
+
+    int dataSize = artGetDataSize(&header);
+    unsigned char* data = reinterpret_cast<unsigned char*>(internal_malloc(dataSize));
+    if (data == nullptr) {
+        return nullptr;
+    }
+
+    memset(data, 0, dataSize);
+    Art* art = reinterpret_cast<Art*>(data);
+    *art = header;
+
+    ArtFrame* frame = reinterpret_cast<ArtFrame*>(data + sizeof(Art) + art->padding[0]);
+    frame->width = static_cast<short>(width);
+    frame->height = static_cast<short>(height);
+    frame->size = static_cast<int>(pixelCount);
+    frame->x = 0;
+    frame->y = 0;
+
+    *frameDataPtr = reinterpret_cast<unsigned char*>(frame) + sizeof(ArtFrame);
+    return art;
+}
+
 static Art* artLoadIndexedPng(const char* path)
 {
     std::vector<unsigned char> encoded;
@@ -1255,47 +1273,44 @@ static Art* artLoadIndexedPng(const char* path)
         return nullptr;
     }
 
-    size_t pixelCount = static_cast<size_t>(width) * static_cast<size_t>(height);
-
-    Art header = {};
-    header.version = 4;
-    header.framesPerSecond = 10;
-    header.actionFrame = 0;
-    header.frameCount = 1;
-    header.dataSize = sizeof(ArtFrame) + static_cast<int>(pixelCount);
-
-    int currentPadding = paddingForSize(sizeof(Art));
-    for (int rotation = 0; rotation < ROTATION_COUNT; rotation++) {
-        header.dataOffsets[rotation] = 0;
-        header.padding[rotation] = currentPadding;
-    }
-
-    int dataSize = artGetDataSize(&header);
-    unsigned char* data = reinterpret_cast<unsigned char*>(internal_malloc(dataSize));
-    if (data == nullptr) {
+    unsigned char* frameData = nullptr;
+    Art* art = artAllocateSingleFrame(static_cast<int>(width), static_cast<int>(height), &frameData);
+    if (art == nullptr) {
         return nullptr;
     }
 
-    memset(data, 0, dataSize);
-    Art* art = reinterpret_cast<Art*>(data);
-    *art = header;
-
-    ArtFrame* frame = reinterpret_cast<ArtFrame*>(data + sizeof(Art) + art->padding[0]);
-    frame->width = static_cast<short>(width);
-    frame->height = static_cast<short>(height);
-    frame->size = static_cast<int>(pixelCount);
-    frame->x = 0;
-    frame->y = 0;
-
-    if (!artUnpackIndexedPngPixels(indexedData, width, height, state.info_png.color.bitdepth, reinterpret_cast<unsigned char*>(frame) + sizeof(ArtFrame))) {
+    if (!artUnpackIndexedPngPixels(indexedData, width, height, state.info_png.color.bitdepth, frameData)) {
         debugPrint("ART: failed to read indexed PNG pixels: %s\n", path);
-        internal_free(data);
+        internal_free(art);
         return nullptr;
     }
 
     return art;
 }
 
+static Art* artLoadPcx(const char* path)
+{
+    char mutablePath[COMPAT_MAX_PATH];
+    strncpy(mutablePath, path, sizeof(mutablePath));
+    mutablePath[sizeof(mutablePath) - 1] = '\0';
+
+    int width = 0;
+    int height = 0;
+    unsigned char* pcxData = datafileRead(mutablePath, &width, &height);
+    if (pcxData == nullptr) {
+        return nullptr;
+    }
+
+    unsigned char* frameData = nullptr;
+    Art* art = artAllocateSingleFrame(width, height, &frameData);
+    if (art != nullptr) {
+        memcpy(frameData, pcxData, static_cast<size_t>(width) * static_cast<size_t>(height));
+    }
+
+    internal_free(pcxData);
+    return art;
+}
+
 static Art* artLoadFrm(const char* path)
 {
     File* stream = fileOpen(path, "rb");
@@ -1340,6 +1355,10 @@ Art* artLoad(const char* path)
         return artLoadIndexedPng(path);
     }
 
+    if (artPathHasExtension(path, ".pcx")) {
+        return artLoadPcx(path);
+    }
+
     Art* art = artLoadFrm(path);
     if (art != nullptr) {
         return art;
@@ -1491,7 +1510,7 @@ public:
 
     const Art* art() const { return _art.get(); }
 
-    unsigned char* frameData(int frame, int direction, int& outWidth, int& outHeight) const;
+    ArtFrame* frame(int frame, int direction) const;
 
     unsigned int mru = 0;
 
@@ -1504,17 +1523,9 @@ NamedCacheEntry::NamedCacheEntry(ArtPtr&& art)
 {
 }
 
-unsigned char* NamedCacheEntry::frameData(int frame, int direction, int& outWidth, int& outHeight) const
+ArtFrame* NamedCacheEntry::frame(int frame, int direction) const
 {
-    unsigned char* data = artGetFrameData(_art.get(), frame, direction);
-    if (!data) {
-        outWidth = 0;
-        outHeight = 0;
-        return nullptr;
-    }
-    outWidth = artGetWidth(_art.get(), frame, direction);
-    outHeight = artGetHeight(_art.get(), frame, direction);
-    return data;
+    return artGetFrame(_art.get(), frame, direction);
 }
 
 std::shared_ptr<NamedCacheEntry> artLockNamedFrameData(const char* path)
@@ -1597,9 +1608,12 @@ ObjectType FrmId::objectType() const
 FrmImage::FrmImage()
 {
     _key = nullptr;
+    _frame = nullptr;
     _data = nullptr;
     _width = 0;
     _height = 0;
+    _xOffset = 0;
+    _yOffset = 0;
 }
 
 FrmImage::~FrmImage()
@@ -1610,9 +1624,12 @@ FrmImage::~FrmImage()
 FrmImage::FrmImage(FrmImage&& other) noexcept
     : _namedKey(std::move(other._namedKey))
     , _key(other._key)
+    , _frame(other._frame)
     , _data(other._data)
     , _width(other._width)
     , _height(other._height)
+    , _xOffset(other._xOffset)
+    , _yOffset(other._yOffset)
 {
     other.resetInternal();
 }
@@ -1623,9 +1640,12 @@ FrmImage& FrmImage::operator=(FrmImage&& other) noexcept
         unlock();
         _namedKey = std::move(other._namedKey);
         _key = other._key;
+        _frame = other._frame;
         _data = other._data;
         _width = other._width;
         _height = other._height;
+        _xOffset = other._xOffset;
+        _yOffset = other._yOffset;
 
         other.resetInternal();
     }
@@ -1633,33 +1653,60 @@ FrmImage& FrmImage::operator=(FrmImage&& other) noexcept
 }
 
 bool FrmImage::lock(const FrmId& frmId)
+{
+    return lock(frmId, 0, 0);
+}
+
+bool FrmImage::lock(const FrmId& frmId, int frame, int direction)
 {
     if (frmId.fid() >= 0) {
-        return lock(frmId.fid());
+        return lock(frmId.fid(), frame, direction);
     }
     if (frmId.filePath() != nullptr) {
         return frmId.hasObjectType()
-            ? lock(frmId.objectType(), frmId.filePath())
-            : lock(frmId.filePath());
+            ? lock(frmId.objectType(), frmId.filePath(), frame, direction)
+            : lock(frmId.filePath(), frame, direction);
     }
     return false;
 }
 
 bool FrmImage::lock(unsigned int fid)
+{
+    return lock(fid, 0, 0);
+}
+
+bool FrmImage::lock(unsigned int fid, int frame, int direction)
 {
     if (isLocked()) {
         return false;
     }
 
-    _data = artLockFrameDataReturningSize(fid, &_key, &_width, &_height);
-    if (!_data) {
+    Art* art = artLock(fid, &_key);
+    if (art == nullptr) {
         return false;
     }
 
+    _frame = artGetFrame(art, frame, direction);
+    if (_frame == nullptr) {
+        unlock();
+        return false;
+    }
+
+    _data = reinterpret_cast<unsigned char*>(_frame) + sizeof(ArtFrame);
+    _width = _frame->width;
+    _height = _frame->height;
+    _xOffset = _frame->x;
+    _yOffset = _frame->y;
+
     return true;
 }
 
 bool FrmImage::lock(const char* frmPath)
+{
+    return lock(frmPath, 0, 0);
+}
+
+bool FrmImage::lock(const char* frmPath, int frame, int direction)
 {
     if (isLocked()) {
         return false;
@@ -1668,21 +1715,33 @@ bool FrmImage::lock(const char* frmPath)
     _namedKey = artLockNamedFrameData(frmPath);
     if (!_namedKey) return false;
 
-    _data = _namedKey->frameData(0, 0, _width, _height);
-    if (_data == nullptr) {
-        _namedKey = nullptr;
+    _frame = _namedKey->frame(frame, direction);
+    if (_frame == nullptr) {
+        unlock();
         return false;
     }
+
+    _data = reinterpret_cast<unsigned char*>(_frame) + sizeof(ArtFrame);
+    _width = _frame->width;
+    _height = _frame->height;
+    _xOffset = _frame->x;
+    _yOffset = _frame->y;
+
     return true;
 }
 
 bool FrmImage::lock(ObjectType objType, const char* frmRelativePath)
+{
+    return lock(objType, frmRelativePath, 0, 0);
+}
+
+bool FrmImage::lock(ObjectType objType, const char* frmRelativePath, int frame, int direction)
 {
     if (objType < OBJ_TYPE_ITEM || objType >= OBJ_TYPE_COUNT) {
         return false;
     }
     snprintf(_art_name, sizeof(_art_name), "%s%s%s\\%s", _cd_path_base, "art\\", gArtListDescriptions[objType].name, frmRelativePath);
-    return lock(_art_name);
+    return lock(_art_name, frame, direction);
 }
 
 void FrmImage::unlock()
@@ -1697,9 +1756,12 @@ void FrmImage::resetInternal()
 {
     _namedKey = nullptr;
     _key = nullptr;
+    _frame = nullptr;
     _data = nullptr;
     _width = 0;
     _height = 0;
+    _xOffset = 0;
+    _yOffset = 0;
 }
 
 } // namespace fallout

src/art.h

@@ -128,7 +128,6 @@ void artRender(int fid, unsigned char* dest, int width, int height, int pitch);
 int art_list_str(int fid, char* name);
 Art* artLock(int fid, CacheEntry** cache_entry);
 unsigned char* artLockFrameData(int fid, int frame, int direction, CacheEntry** out_cache_entry);
-unsigned char* artLockFrameDataReturningSize(int fid, CacheEntry** out_cache_entry, int* widthPtr, int* heightPtr);
 int artUnlock(CacheEntry* cache_entry);
 int artCacheFlush();
 int artCopyFileName(int objectType, int id, char* dest);
@@ -185,8 +184,8 @@ private:
     const char* _path = nullptr;
 };
 
-// A helper for using RAII to read single-frame FRM's.
-// lock/unlock use the art-cache instead of just loading/unloading directly.
+// RAII helper for locking one selected frame from FID-backed or path-backed art.
+// lock/unlock use caches instead of just loading/unloading directly.
 class FrmImage {
 public:
     FrmImage();
@@ -201,13 +200,19 @@ public:
 
     bool isLocked() const { return _key != nullptr || _namedKey; }
     bool lock(const FrmId& frmId);
+    bool lock(const FrmId& frmId, int frame, int direction);
     bool lock(unsigned int fid);
+    bool lock(unsigned int fid, int frame, int direction);
     bool lock(const char* frmPath);
+    bool lock(const char* frmPath, int frame, int direction);
     bool lock(ObjectType objType, const char* frmRelativePath);
+    bool lock(ObjectType objType, const char* frmRelativePath, int frame, int direction);
     void unlock();
 
     int getWidth() const { return _width; }
     int getHeight() const { return _height; }
+    int getXOffset() const { return _xOffset; }
+    int getYOffset() const { return _yOffset; }
     // Returns FRM frame data if locked, nullptr otherwise.
     unsigned char* getData() const { return _data; }
 
@@ -218,9 +223,12 @@ private:
 
     std::shared_ptr<NamedCacheEntry> _namedKey;
     CacheEntry* _key = nullptr;
+    ArtFrame* _frame = nullptr;
     unsigned char* _data = nullptr;
     int _width = 0;
     int _height = 0;
+    int _xOffset = 0;
+    int _yOffset = 0;
 };
 
 } // namespace fallout

src/automap.cc

@@ -46,6 +46,8 @@ static void _decode_map_data(int elevation);
 static int automapCreate();
 static int _copy_file_data(File* stream1, File* stream2, int length);
 
+static int gAutomapWindow = -1;
+
 typedef enum AutomapFrm {
     AUTOMAP_FRM_BACKGROUND,
     AUTOMAP_FRM_BUTTON_UP,
@@ -326,6 +328,7 @@ void automapShow(bool isInGame, bool isUsingScanner)
     int automapWindowY = (screenGetHeight() - AUTOMAP_WINDOW_HEIGHT) / 2;
     // adding WINDOW_TRANSPARENT and WINDOW_DRAGGABLE_BY_BACKGROUND for testing temporarily
     int window = windowCreate(automapWindowX, automapWindowY, AUTOMAP_WINDOW_WIDTH, AUTOMAP_WINDOW_HEIGHT, color, WINDOW_MODAL | WINDOW_MOVE_ON_TOP | WINDOW_TRANSPARENT | WINDOW_DRAGGABLE_BY_BACKGROUND);
+    gAutomapWindow = window;
 
     int scannerBtn = buttonCreate(window,
         111,
@@ -493,10 +496,16 @@ void automapShow(bool isInGame, bool isUsingScanner)
     }
 
     windowDestroy(window);
+    gAutomapWindow = -1;
     fontSetCurrent(oldFont);
     touch_set_touchscreen_mode(false);
 }
 
+int automapGetWindow()
+{
+    return windowGetWindow(gAutomapWindow) != nullptr ? gAutomapWindow : -1;
+}
+
 // Renders automap in Map window.
 //
 // 0x41BD1C draw_top_down_map

src/automap.h

@@ -55,6 +55,7 @@ void automapShow(bool isInGame, bool isUsingScanner);
 int automapRenderInPipboyWindow(int win, int map, int elevation);
 int automapSaveCurrent();
 int automapGetHeader(AutomapHeader** automapHeaderPtr);
+int automapGetWindow();
 
 void automapSetDisplayMap(int map, bool available);
 

src/character_editor.cc

@@ -5680,6 +5680,29 @@ void characterEditorReset()
     gCharacterEditorLastLevel = 1;
 }
 
+int characterEditorGetWindow()
+{
+    return windowGetWindow(gCharacterEditorWindow) != nullptr ? gCharacterEditorWindow : -1;
+}
+
+void characterEditorDisplayStats()
+{
+    if (windowGetWindow(gCharacterEditorWindow) == nullptr) {
+        return;
+    }
+
+    critterUpdateDerivedStats(gDude);
+    critterAdjustHitPoints(gDude, 0);
+
+    characterEditorDrawSkills(0);
+    characterEditorDrawPrimaryStat(RENDER_ALL_STATS, 0, 0);
+    characterEditorDrawPcStats();
+    characterEditorDrawDerivedStats();
+    characterEditorDrawFolders();
+    characterEditorDrawCard();
+    windowRefresh(gCharacterEditorWindow);
+}
+
 // level up if needed
 //
 // 0x43C228 UpdateLevel

src/character_editor.h

@@ -14,6 +14,8 @@ char* _strmfe(char* dest, const char* name, const char* ext);
 int characterEditorSave(File* stream);
 int characterEditorLoad(File* stream);
 void characterEditorReset();
+int characterEditorGetWindow();
+void characterEditorDisplayStats();
 
 } // namespace fallout
 

src/critter.cc

@@ -1359,13 +1359,16 @@ int critterGetMovementPointCostAdjustedForCrippledLegs(Object* critter, int dist
     }
 
     int flags = critter->data.critter.combat.results;
+    int actionPoints = 0;
     if ((flags & DAM_CRIP_LEG_LEFT) != 0 && (flags & DAM_CRIP_LEG_RIGHT) != 0) {
-        return 8 * distance;
+        actionPoints = 8 * distance;
     } else if ((flags & DAM_CRIP_LEG_ANY) != 0) {
-        return 4 * distance;
+        actionPoints = 4 * distance;
     } else {
-        return distance;
+        actionPoints = distance;
     }
+
+    return scriptHooks_MoveCost(critter, distance, actionPoints);
 }
 
 // 0x42E66C critterIsOverloaded

src/game.cc

@@ -448,6 +448,7 @@ void gameReset()
     scriptHooksReset();
     sfallArraysReset();
     sfall_gl_scr_reset();
+    sfall_ini_cache_clear();
     sfallOnGameReset();
     gGameLoaded = false;
 }

src/game_dialog.cc

@@ -3495,6 +3495,11 @@ bool gameDialogIsBarterWindowExpanded()
     return gBarterWindowExpanded;
 }
 
+int gameDialogGetWindow()
+{
+    return windowGetWindow(gGameDialogWindow) != nullptr ? gGameDialogWindow : -1;
+}
+
 // 0x448660 gdialog_barter_cleanup_tables
 void gameDialogBarterCleanupTables()
 {

src/game_dialog.h

@@ -40,6 +40,7 @@ void gameDialogSetBarterModifier(int modifier);
 int gameDialogBarter(int modifier);
 void gameDialogEndBarter();
 bool gameDialogIsBarterWindowExpanded();
+int gameDialogGetWindow();
 
 } // namespace fallout
 

src/interpreter_extra.cc

@@ -151,7 +151,7 @@ typedef enum OpRegAnimFunc {
 static void scriptPredefinedError(Program* program, const char* name, int error);
 static void scriptError(const char* format, ...);
 static int tileIsVisible(int tile);
-static int _correctFidForRemovedItem(Object* critter, Object* item, int flags);
+int correctFidForRemovedItem(Object* critter, Object* item, int flags);
 static void opGiveExpPoints(Program* program);
 static void opScrReturn(Program* program);
 static void opPlaySfx(Program* program);
@@ -407,7 +407,7 @@ static int tileIsVisible(int tile)
 }
 
 // 0x45409C correctFidForRemovedItem
-static int _correctFidForRemovedItem(Object* critter, Object* item, int flags)
+int correctFidForRemovedItem(Object* critter, Object* item, int flags)
 {
     InvenSlot invenSlot = InvenSlot::Armor;
     if ((flags & OBJECT_IN_RIGHT_HAND) != 0) {
@@ -1683,7 +1683,7 @@ static void opRemoveObjectFromInventory(Program* program)
         tileWindowRefreshRect(&rect, item->elevation);
 
         if (updateFlags) {
-            _correctFidForRemovedItem(owner, item, flags);
+            correctFidForRemovedItem(owner, item, flags);
         }
     }
 }
@@ -4641,7 +4641,7 @@ static void opMoveObjectInventoryToObject(Program* program)
             flags |= OBJECT_IN_RIGHT_HAND;
         }
 
-        _correctFidForRemovedItem(object1, oldWeapon, flags);
+        correctFidForRemovedItem(object1, oldWeapon, flags);
     }
 
     itemMoveAll(object1, object2);

src/interpreter_extra.h

@@ -2,10 +2,11 @@
 #define INTERPRETER_EXTRA_H
 
 #include "interpreter.h"
+#include "obj_types.h"
 
 namespace fallout {
 
-enum class InvenSlot {
+enum class InvenSlot : int {
     Armor = 0, // INVEN_TYPE_WORN
     RightHand = 1, // INVEN_TYPE_RIGHT_HAND
     LeftHand = 2, // INVEN_TYPE_LEFT_HAND
@@ -13,6 +14,8 @@ enum class InvenSlot {
 
 constexpr int kInvenSlotInvCount = -2;
 
+int correctFidForRemovedItem(Object* critter, Object* item, int flags);
+
 void _intExtraClose_();
 void _initIntExtra();
 void intExtraUpdate();