Update game_dialog.cc

Correct fix to match Fallout 2 vanilla assets.

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

@@ -89,6 +89,7 @@ jobs:
           folder: fallout2-ce-ems/dist
           target-folder: ${{ steps.set-path.outputs.DEST_DIR }}
           clean: false
+          single-commit: true
 
       - name: Comment preview URL on PR
         if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository

.github/workflows/ci-build.yml

@@ -87,7 +87,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: os/android/app/.cxx
-          key: android-cmake-v2
+          key: android-cmake-v100
 
       - name: Setup signing config
         if: env.KEYSTORE_FILE_BASE64 != '' && env.KEYSTORE_PROPERTIES_FILE_BASE64 != ''
@@ -128,7 +128,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: out
-          key: ios-cmake-v5
+          key: ios-cmake-v100
 
       - name: Configure
         run: |
@@ -183,7 +183,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: out
-          key: linux-${{ matrix.arch }}-cmake-v3
+          key: linux-${{ matrix.arch }}-cmake-v100
 
       - name: Configure
         run: |
@@ -288,7 +288,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: out
-          key: macos-cmake-v6
+          key: macos-cmake-v100
 
       - name: Configure
         run: |
@@ -313,7 +313,7 @@ jobs:
   windows:
     name: Windows (${{ matrix.arch }})
 
-    runs-on: windows-2019
+    runs-on: windows-2025
 
     strategy:
       fail-fast: false
@@ -328,19 +328,28 @@ jobs:
       - name: Clone
         uses: actions/checkout@v4
 
+      - name: Install Visual Studio 2019 Build Tools with v141_xp
+        shell: cmd
+        run: |
+          choco install visualstudio2019buildtools -y --package-parameters="'--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.xp --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK.10240 --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP --add Microsoft.VisualStudio.Component.WinXP'"
+
       - name: Cache cmake build
         uses: actions/cache@v4
         with:
           path: out
-          key: windows-${{ matrix.arch }}-cmake-v2
+          key: windows-${{ matrix.arch }}-cmake-v100
 
       - name: Configure
+        shell: cmd
         run: |
-          cmake --preset windows-${{ matrix.arch }}
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
+          && cmake --preset windows-${{ matrix.arch }}
 
       - name: Build
+        shell: cmd
         run: |
-          cmake --build --preset windows-${{ matrix.arch }}-release
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
+          && cmake --build --preset windows-${{ matrix.arch }}-release
 
       - name: Change executable file name
         run: |

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

@@ -29,5 +29,18 @@ jobs:
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git commit -am "🚮 Remove preview for closed PR #${{ github.event.pull_request.number }}"
-          git push
+
+          CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+          echo "Current branch: $CURRENT_BRANCH"
+
+          if [ "$CURRENT_BRANCH" != "gh-pages" ]; then
+            echo "❌ Refusing to force-push to non-gh-pages branch: $CURRENT_BRANCH"
+            exit 1
+          fi
+
+          if git diff --cached --quiet; then
+            echo "No changes to commit"
+          else
+            git commit --amend -m "🚮 Remove preview for closed PR #${{ github.event.pull_request.number }}"
+            git push --force
+          fi

.github/workflows/release.yml

@@ -243,7 +243,7 @@ jobs:
   windows:
     name: Windows (${{ matrix.arch }})
 
-    runs-on: windows-2019
+    runs-on: windows-2025
 
     strategy:
       fail-fast: false
@@ -258,6 +258,11 @@ jobs:
       - name: Clone
         uses: actions/checkout@v4
 
+      - name: Install Visual Studio 2019 Build Tools with v141_xp
+        shell: cmd
+        run: |
+          choco install visualstudio2019buildtools -y --package-parameters="'--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.xp --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK.10240 --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP --add Microsoft.VisualStudio.Component.WinXP'"
+
       - name: Cache cmake build
         uses: actions/cache@v4
         with:
@@ -265,19 +270,16 @@ jobs:
           key: windows-${{ matrix.arch }}-cmake-v1
 
       - name: Configure
+        shell: cmd
         run: |
-          cmake \
-            -B build \
-            -G "Visual Studio 16 2019" \
-            -A ${{ matrix.generator-platform }} \
-            # EOL
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
+          && cmake -B build -G "Visual Studio 16 2019" -A ${{ matrix.generator-platform }}
 
       - name: Build
+        shell: cmd
         run: |
-          cmake \
-            --build build \
-            --config RelWithDebInfo \
-            # EOL
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
+          && cmake --build build --config RelWithDebInfo
 
       - name: Upload
         run: |

README.md

@@ -125,7 +125,7 @@ IFACE_BAR_SIDES_ORI=0
 ;This will increase the width of the interface bar expanding the area used to display text.
 ;if IFACE_BAR_WIDTH=640 - Interface bar will remain at it's original width.
 ;if IFACE_BAR_WIDTH=800 - Interface bar will use 800pix wide asset from f2_res.dat.
-IFACE_BAR_WIDTH=640
+;IFACE_BAR_WIDTH=640
 ```
 
 Recommendations:

files/ddraw.ini

@@ -4,7 +4,8 @@
 [Main]
 
 ;Set to one to hide areas outside map bounds when using higher than 640x480 resolution, and to zero to disable
-;HiResMode=1
+;EnableHighResolutionStencil=1
+
 
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Misc]

sfall_testing/README.md

@@ -4,30 +4,48 @@
 
 This folder contains scripts which can be used for sFall opcodes.
 
-## Build script using sFall Script Editor
+## Building
 
-1. Get "Fallout sFall Script Editor v4.1.7.RC1", for example from https://nuclear-grot.ucoz.net/forum/12-20-1
+Get latest `compile.exe` from [modders pack](https://sourceforge.net/projects/sfall/files/Modders%20pack/) or from [repository](https://github.com/sfall-team/sslc) and run it this way:
 
-2. Run script editor, add "sfall_headers" into "Location folder of headers files" in the options
+```sh
+compile.exe -q -p -l -O2 -d -s -n -I<sfall_headers_id> <script_name.ssl>
+```
 
-3. Open any script here and compile it
+(sfall headers can be found in modderspack)
+
+
+### Build script using sFall Script Editor
+
+- Get "Fallout sFall Script Editor v4.1.7.RC1", for example from https://nuclear-grot.ucoz.net/forum/12-20-1
+
+- Run script editor, add "sfall_headers" into "Location folder of headers files" in the options
+
+- Open any script here and compile it
+
+- This shoud create compiled script <file.int>
+
+
+### Build script using VSCode extension
+
+- Install [VSCode Extension](https://marketplace.visualstudio.com/items?itemName=BGforge.bgforge-mls)
 
-4. This shoud create compiled script <file.int>
 
 
 ## Run test script
 
-1. Move compiled .int file into game folder as `mods/tests/SCRIPTS/OBJ_DUDE.INT` (case-sensitive!)
+1. Move compiled `.int` file into game folder as `data/scripts/gl_<script_name>.int`
 
-2. Change `mods/mods_order.txt` file: add a line `tests` there
+2. Change `ddraw.ini` and add this section:
+```ini
+[Scripts]
+GlobalScriptPaths=data/scripts/gl*.int
+```
+
+(or add new path using comma as separator)
+
+Note that on non-Windows it have to be `/` as folder separator
 
 3. Run game, check that game displays message about tests
 
-4. Comment tests line in `mods/mods_order.txt` in order to enable game back
 
-
-
-## TODO
-
-- Use custom global script instead of `obj_dude`
-- Add note about compile.exe and https://marketplace.visualstudio.com/items?itemName=BGforge.bgforge-mls

sfall_testing/gl_test_arrays.ssl

@@ -1,30 +1,8 @@
 #include "lib.arrays.h"
-
+#include "test_utils.h"
 // #include "define_lite.h"
 
 
-variable test_suite_errors := 0;
-variable test_suite_verbose := true;
-
-#ifndef assertEquals
-procedure assertEquals(variable desc, variable a, variable b) begin
-   if (a != b or typeof(a) != typeof(b)) then begin
-      display_msg("Assertion failed \""+desc+"\": "+a+" != "+b);
-      test_suite_errors ++;
-   end else if (test_suite_verbose) then begin
-      display_msg("Assert \""+desc+"\" ok");
-   end
-end
-
-procedure assertNotEquals(variable desc, variable a, variable b) begin
-   if (a == b) then begin
-      display_msg("Assertion failed \""+desc+"\": "+a+" == "+b);
-      test_suite_errors ++;
-   end else if (test_suite_verbose) then begin
-      display_msg("Assert \""+desc+"\" ok");
-   end
-end
-#endif
 
 #define ARRAY_MAX_STRING	   (255)
 #define ARRAY_MAX_SIZE		 (100000)
@@ -187,6 +165,8 @@ procedure array_test_suite begin
    */
 
    display_msg("All tests finished with "+test_suite_errors+" errors.");
+
+   call report_test_results("arrays");
 end
 
 
@@ -195,7 +175,7 @@ end
 
 
 
-procedure map_enter_p_proc begin
+procedure start begin
    display_msg("Starting tests");
    call array_test_suite();
 end

sfall_testing/gl_test_ini.ssl

@@ -0,0 +1,69 @@
+#include "lib.arrays.h" // For arrays_equal, len_array, etc.
+#include "test_utils.h"   // For assertEquals, VALTYPE_STR, report_test_results
+
+// To test: copy test.ini into the game folder before running
+procedure ini_test_suite begin
+    variable result_array, expected_array, key_type, value_type, count, key_val_pair;
+
+    display_msg("--- Testing ini functions");
+
+    // Test Case 1: Valid file, valid section
+    result_array := get_ini_section("test.ini", "ValidSection");
+    expected_array := {"Key1": "Value1", "Key2": "2"};
+    call assertEquals("TC1 Size", len_array(result_array), 2);
+    call assertEquals("TC1 Content", arrays_equal(result_array, expected_array), true);
+    count := 0;
+    foreach key_val_pair in result_array begin
+        count += 1;
+        call assertEquals("TC1 Key Type " + count, typeof(key_val_pair[0]), VALTYPE_STR);
+        call assertEquals("TC1 Value Type " + count, typeof(key_val_pair[1]), VALTYPE_STR);
+    end
+
+    // basic fetchers
+    call assertEquals("TC2 Specific Key1 Value", result_array["Key1"], "Value1");
+    call assertEquals("TC2 get_ini_setting string", get_ini_setting("test.ini|ValidSection|Key1"), 0);
+    call assertEquals("TC2 get_ini_string string", get_ini_string("test.ini|ValidSection|Key1"), "Value1");
+    call assertEquals("TC2 get_ini_setting int", get_ini_setting("test.ini|ValidSection|Key2"), 2);
+    call assertEquals("TC2 get_ini_string int", get_ini_string("test.ini|ValidSection|Key2"), "2");
+
+    // INI file not found
+    result_array := get_ini_section("nonexistent.ini", "AnySection");
+    call assertEquals("TC3 Size", len_array(result_array), 0);
+    call assertEquals("TC3 Is Map", array_key(result_array, -1), 1); // Should still be an associative array
+    call assertEquals("TC3 get_ini_setting", get_ini_setting("notexist.ini|ValidSection|Key2"), 0);
+    call assertEquals("TC3 get_ini_string", get_ini_string("notexist.ini|ValidSection|Key2"), "");
+
+    // Valid file, section not found
+    result_array := get_ini_section("test.ini", "NonExistentSection");
+    call assertEquals("TC4 Size", len_array(result_array), 0);
+    call assertEquals("TC4 Is Map", array_key(result_array, -1), 1);
+    call assertEquals("TC4 get_ini_setting", get_ini_setting("test.ini|NonExistentSection|Key2"), 0);
+    call assertEquals("TC4 get_ini_string", get_ini_string("test.ini|NonExistentSection|Key2"), "");
+
+
+    // Valid file, empty section
+    result_array := get_ini_section("test.ini", "EmptySection");
+    call assertEquals("TC5 Size", len_array(result_array), 0);
+    call assertEquals("TC5 Is Map", array_key(result_array, -1), 1);
+    call assertEquals("TC5 get_ini_setting", get_ini_setting("test.ini|EmptySection|Key2"), 0);
+    call assertEquals("TC5 get_ini_string", get_ini_string("test.ini|EmptySection|Key2"), "");
+
+    // set ini setting
+    set_ini_setting("test_set.ini|ValidSection|Key3", "OldValue");
+    call assertEquals("TC6 set_ini_setting 1", get_ini_string("test_set.ini|ValidSection|Key3"), "OldValue");
+    set_ini_setting("test_set.ini|ValidSection|Key3", "NewValue");
+    call assertEquals("TC6 set_ini_setting 2", get_ini_string("test_set.ini|ValidSection|Key3"), "NewValue");
+    set_ini_setting("test_set.ini|ValidSection|Key3", 2);
+    call assertEquals("TC6 set_ini_setting int", get_ini_setting("test_set.ini|ValidSection|Key3"), 2);
+
+    // get_init_sections
+    result_array := get_ini_sections("test.ini");
+    call assertEquals("TC7 get_ini_sections size", len_array(result_array), 3);
+    call assertTrue("TC7 get_ini_sections", scan_array(result_array, "TestMisc") >= 0);
+
+    call report_test_results("ini");
+end
+
+procedure start begin
+    call ini_test_suite();
+end

sfall_testing/gl_test_math.ssl

@@ -0,0 +1,71 @@
+#include "test_utils.h"
+#include "sfall.h"
+
+procedure start begin
+
+    display_msg("Testing math functions...");
+
+    call assertFloat("sin(0)", sin(0), 0.0);
+    call assertFloat("sin(PI/2)", sin(1.5708), 1.0);
+    call assertFloat("sin(PI)", sin(3.1416), 0.0);
+    call assertFloat("sin(-PI/2)", sin(-1.5708), -1.0);
+
+    call assertFloat("cos(0)", cos(0), 1.0);
+    call assertFloat("cos(PI/2)", cos(1.5708), 0.0);
+    call assertFloat("cos(PI)", cos(3.1416), -1.0);
+    call assertFloat("cos(-PI)", cos(-3.1416), -1.0);
+
+    call assertFloat("tan(0)", tan(0), 0.0);
+    call assertFloat("tan(PI/4)", tan(0.7854), 1.0);
+    call assertFloat("tan(-PI/4)", tan(-0.7854), -1.0);
+
+    call assertFloat("arctan(0, 1)", arctan(0, 1), 0.0);
+    call assertFloat("arctan(1, 1)", arctan(1, 1), 0.7854);
+    call assertFloat("arctan(-1, 1)", arctan(-1, 1), -0.7854);
+    call assertFloat("arctan(1, 0)", arctan(1, 0), 1.5708);
+
+    call assertFloat("log(1)", log(1), 0.0);
+    call assertFloat("log(e)", log(2.7183), 1.0);
+    call assertFloat("log(10)", log(10), 2.3026);
+
+    call assertFloat("exponent(0)", exponent(0), 1.0);
+    call assertFloat("exponent(1)", exponent(1), 2.7183);
+    call assertFloat("exponent(2)", exponent(2), 7.3891);
+    call assertFloat("exponent(-1)", exponent(-1), 0.3679);
+
+    call assertEquals("ceil(2.1)", ceil(2.1), 3);
+    call assertEquals("ceil(2.0)", ceil(2.0), 2);
+    call assertEquals("ceil(-2.1)", ceil(-2.1), -2);
+    call assertEquals("ceil(-2.9)", ceil(-2.9), -2);
+
+    call assertEquals("floor2(2.1)", floor2(2.1), 2);
+    call assertEquals("floor2(2.9)", floor2(2.9), 2);
+    call assertEquals("floor2(-2.1)", floor2(-2.1), -3);
+    call assertEquals("floor2(-2.9)", floor2(-2.9), -3);
+
+    call assertEquals("2^3", 2^3, 8);
+    call assertEquals("4^2", 4^2, 16);
+    call assertEquals("3^0", 3^0, 1);
+    call assertFloat("2^-1", 2^-1, 0); // note: int truncation
+    call assertFloat("2^-1", 2^-1.0, 0.5);
+    call assertFloat("4^0.5", 4^0.5, 2.0);
+    call assertFloat("8^(1/3)", 8^(1.0/3.0), 2.0);
+    call assertFloat("2.5^2", 2.5^2, 6.25);
+
+    call assertEquals("round(2.3)", round(2.3), 2);
+    call assertEquals("round(2.5)", round(2.5), 3);
+    call assertEquals("round(2.7)", round(2.7), 3);
+    call assertEquals("round(-2.3)", round(-2.3), -2);
+    call assertEquals("round(-2.5)", round(-2.5), -3);
+    call assertEquals("round(-2.7)", round(-2.7), -3);
+    call assertEquals("round(0.0)", round(0.0), 0);
+    call assertEquals("round(1.0)", round(1.0), 1);
+    call assertEquals("round(<int>)", round(1), 1);
+
+    call assertFloat("sin(arctan(1, 1))", sin(arctan(1, 1)), 0.7071);
+    call assertFloat("cos(arctan(1, 1))", cos(arctan(1, 1)), 0.7071);
+    call assertFloat("log(ceil(2.7))", log(ceil(2.7)), 1.0986);
+    call assertFloat("exponent(log(5))", exponent(log(5)), 5.0);
+
+    call report_test_results("math");
+end

sfall_testing/gl_test_misc.ssl

@@ -0,0 +1,15 @@
+#include "test_utils.h"
+#include "sfall.h"
+
+procedure start begin
+    // TODO: move this to a more suitable place, once we have more functions implemented
+    // These are in the "Other" category in the sfall documentation
+    display_msg("Testing misc functions...");
+    variable hand := active_hand;
+    toggle_active_hand;
+    call assertEquals("active_hand toggled", active_hand, 1 - hand);
+    toggle_active_hand;
+    call assertEquals("active_hand toggled", active_hand, hand);
+    
+    call report_test_results("misc");
+end

sfall_testing/gl_test_sprintf.ssl

@@ -0,0 +1,82 @@
+#include "test_utils.h"
+#include "sfall.h"
+
+#define REPEAT_64 "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+#define REPEAT_512 REPEAT_64 REPEAT_64 REPEAT_64 REPEAT_64 REPEAT_64 REPEAT_64 REPEAT_64 REPEAT_64
+#define REPEAT_1024 REPEAT_512 REPEAT_512
+
+procedure start begin
+
+    display_msg("Testing sprintf...");
+
+    call assertEquals("sprintf hello world", sprintf("Hello %s", "World"), "Hello World");
+
+    call assertEquals("sprintf empty string", sprintf("", 123), "");
+
+    call assertEquals("sprintf number string", sprintf("%d", 123), "123");
+
+    call assertEquals("sprintf number inside string", sprintf("Hello %d !", 123), "Hello 123 !");
+
+    call assertEquals("sprintf ascii code", sprintf("Hello %c !", 123), "Hello { !");
+
+    call assertEquals("sprintf float string", sprintf("Hello %f !", 3.4), "Hello 3.400000 !");
+
+    call assertEquals("sprintf float string", sprintf("Hello %d !", 10/4), "Hello 2 !");
+
+    call assertEquals("sprintf two strings", sprintf("Hello %s %s", "World"), "Hello World World");
+
+    call assertEquals("Long string", sprintf(REPEAT_1024"x", 1), "Error");
+
+    call assertEquals("Not so long", sprintf(REPEAT_1024, 1), REPEAT_1024);
+
+
+    call assertEquals("string_format1 hello world", string_format1("Hello %s!", "World"), "Hello World!");
+    call assertEquals("string_format1 auto hello world", string_format("Hello %s!", "World"), "Hello World!");
+
+    call assertEquals("string_format2 hello world", string_format2("Hello %s%s!", "Wo","rld"), "Hello World!");
+    call assertEquals("string_format2 auto hello world", string_format("Hello %s%s!", "Wo","rld"), "Hello World!");
+
+    call assertEquals("string_format3 hello world", string_format3("Hell%s %s%s!", "o", "Wo","rld"), "Hello World!");
+    call assertEquals("string_format3 auto hello world", string_format("Hell%s %s%s!", "o", "Wo","rld"), "Hello World!");
+
+    call assertEquals("string_format4 hello world", string_format4("Hel%s%s %s%s!", "l", "o", "Wo","rld"), "Hello World!");
+    call assertEquals("string_format4 auto hello world", string_format("Hel%s%s %s%s!", "l", "o", "Wo","rld"), "Hello World!");
+
+    call assertEquals("string_format5 hello world", string_format5("He%s%s%s %s%s!", "l", "l", "o", "Wo","rld"), "Hello World!");
+    call assertEquals("string_format5 auto hello world", string_format("He%s%s%s %s%s!", "l", "l", "o", "Wo","rld"), "Hello World!");
+
+    call assertEquals("string_format6 hello world", string_format6("H%s%s%s%s %s%s!", "e", "l", "l", "o", "Wo","rld"), "Hello World!");
+    call assertEquals("string_format6 auto hello world", string_format("H%s%s%s%s %s%s!", "e", "l", "l", "o", "Wo","rld"), "Hello World!");
+
+    call assertEquals("string_format7 hello world", string_format7("%s%s%s%s%s %s%s!", "H", "e", "l", "l", "o", "Wo","rld"), "Hello World!");
+    call assertEquals("string_format7 auto hello world", string_format("%s%s%s%s%s %s%s!", "H", "e", "l", "l", "o", "Wo","rld"), "Hello World!");
+
+    call assertEquals("formatted string length 1024", strlen(sprintf(REPEAT_1024, 1)), 1024);
+
+    call assertEquals("formatted string length 5119", strlen(
+         string_format7(
+            "%s%s%s%s%s%s%s",
+            REPEAT_1024,
+            REPEAT_1024,
+            REPEAT_1024,
+            REPEAT_1024,
+            REPEAT_1024,
+            REPEAT_1024,
+            REPEAT_1024)), 5119);
+
+    call assertEquals("string_tolower", string_tolower("miXeD CaSe"), "mixed case");
+    call assertEquals("string_toupper", string_toupper("miXeD CaSe"), "MIXED CASE");
+
+    call assertEquals("string_find ok", string_find("Hello World", "World"), 6);
+    call assertEquals("string_find missing", string_find("Hello World", "Zebra"), -1);
+    call assertEquals("string_find_from", string_find_from("Hello World", "o", 6), 7);
+
+    call assertEquals("string_compare ok", string_compare("Hello World", "HeLlO WoRld"), 1);
+    call assertEquals("string_compare neq", string_compare("Hello World", "HeLlO WoRld!"), 0);
+    call assertEquals("string_compare_locale", string_compare_locale("Hello World", "HeLlO WoRld", 866), 1); // TODO: would be nice to compare cyrillic
+
+    call assertEquals("charcode", charcode("A"), 65);
+    call assertEquals("charcode empty", charcode(""), 0);
+
+    call report_test_results("sprintf");
+end

sfall_testing/gl_test_stats.ssl

@@ -0,0 +1,162 @@
+#include "define_lite.h"
+#include "sfall.h"
+#include "test_utils.h"
+#include "command_lite.h"
+
+procedure test_stat_pc(variable stat_id) begin
+    display_msg("Stat " + stat_id + " = " +
+       get_pc_base_stat(stat_id) + " + " +
+       get_pc_extra_stat(stat_id));
+
+
+    call assertNotEquals("Not interesting stat, base stat is zero", get_pc_base_stat(stat_id), 0);
+    
+    variable old_base_stat := get_pc_base_stat(stat_id);
+    variable old_extra_stat := get_pc_extra_stat(stat_id);
+
+    set_pc_base_stat(stat_id, old_base_stat + 2);
+    set_pc_extra_stat(stat_id, old_extra_stat + 4);
+    // display_msg("Stat after update " + stat_id + " = " +
+    //    get_pc_base_stat(stat_id) + " + " +
+    //    get_pc_extra_stat(stat_id));
+    if (stat_id > STAT_lu) then begin
+        call assertNotEquals("Base stat was updated while it shouldn't",
+            get_pc_base_stat(stat_id), old_base_stat + 2);
+    end else begin
+        call assertEquals("Base stat updated",
+            get_pc_base_stat(stat_id), old_base_stat + 2);
+    end
+    
+    set_pc_base_stat(stat_id, old_base_stat);
+    set_pc_extra_stat(stat_id, old_extra_stat);
+
+    // display_msg("Stat after reset " + stat_id + " = " +
+    //    get_pc_base_stat(stat_id) + " + " +
+    //    get_pc_extra_stat(stat_id));
+    
+    call assertEquals("Base stat reset",
+        get_pc_base_stat(stat_id), old_base_stat);
+ 
+    call assertEquals("Extra stat reset",
+        get_pc_extra_stat(stat_id), old_extra_stat);    
+end
+
+procedure test_stat_critter(variable critter, variable stat_id) begin
+    display_msg("Stat " + stat_id + " = " +
+       get_critter_base_stat(critter, stat_id) + " + " +
+       get_critter_extra_stat(critter, stat_id));
+
+    call assertNotEquals("Not interesting stat, base stat is zero",
+        get_critter_base_stat(critter, stat_id), 0);
+    
+    variable old_base_stat := get_critter_base_stat(critter, stat_id);
+    variable old_extra_stat := get_critter_extra_stat(critter, stat_id);
+
+    set_critter_base_stat(critter, stat_id, old_base_stat + 2);
+    set_critter_extra_stat(critter, stat_id, old_extra_stat + 4);
+    // display_msg("Stat after update " + stat_id + " = " +
+    //    get_critter_base_stat(critter, stat_id) + " + " +
+    //    get_critter_extra_stat(critter, stat_id));
+    if (stat_id > STAT_lu) then begin
+        call assertNotEquals("Base stat was updated while it shouldn't",
+            get_critter_base_stat(critter, stat_id), old_base_stat + 2);
+    end else begin
+        call assertEquals("Base stat updated",
+            get_critter_base_stat(critter, stat_id), old_base_stat + 2);
+    end
+    
+    set_critter_base_stat(critter, stat_id, old_base_stat);
+    set_critter_extra_stat(critter, stat_id, old_extra_stat);
+    // display_msg("Stat after reset " + stat_id + " = " +
+    //    get_critter_base_stat(critter, stat_id) + " + " +
+    //    get_critter_extra_stat(critter, stat_id));
+    call assertEquals("Base stat reset",
+        get_critter_base_stat(critter, stat_id), old_base_stat);
+    call assertEquals("Extra stat reset",
+        get_critter_extra_stat(critter, stat_id), old_extra_stat);
+end
+
+procedure test_derived_base_stat_critter(variable critter) begin
+    display_msg("Testing derived stats on " + obj_name(critter));
+
+    variable old_agility;
+    old_agility := get_critter_base_stat(critter, STAT_ag);
+
+    call assertNotEquals("Initial agility is 10", old_agility, 10);
+    
+    call assertNotEquals("Action points is 10 while agility is not 10", get_critter_base_stat(critter, STAT_max_move_points), 10);
+
+    set_critter_base_stat(critter, STAT_ag, 10);
+
+    call assertEquals("Action points updated to 10",
+        get_critter_base_stat(critter, STAT_max_move_points), 10);
+
+    set_critter_base_stat(critter, STAT_ag, old_agility);
+
+    call assertNotEquals("Action points updated from 10",
+        get_critter_base_stat(critter, STAT_max_move_points), 10);
+        
+end
+
+procedure start begin
+    display_msg("Testing stats...");
+    test_suite_errors := 0;
+
+    call test_stat_pc(STAT_max_hit_points);
+
+    call test_stat_pc(STAT_lu);
+    
+
+    variable critter;
+    variable closest_critter := dude_obj;
+    foreach critter in list_as_array(LIST_CRITTERS) begin
+        if (is_critter_dead(critter)) then begin
+            continue;
+        end
+        if tile_distance(dude_tile, tile_num(critter)) == 0 then begin
+            continue;
+        end
+        if (tile_distance(dude_tile, tile_num(critter)) <
+              tile_distance(dude_tile, tile_num(closest_critter))) or
+            (closest_critter == dude_obj)
+            then begin
+            closest_critter := critter;
+        end
+    end
+    
+    // display_msg("Closest " + obj_name(closest_critter) + " distance: " + 
+     //   tile_distance(dude_tile, tile_num(closest_critter)));
+
+    call test_stat_critter(dude_obj, STAT_max_hit_points);
+    call test_stat_critter(dude_obj, STAT_lu);
+
+    if closest_critter != dude_obj then begin
+        display_msg("Testing stats for " + obj_name(closest_critter));
+        call test_stat_critter(closest_critter, STAT_max_hit_points);
+        call test_stat_critter(closest_critter, STAT_lu);
+    end else begin
+        display_msg("FAIL: No other critters found to test stats");
+        test_suite_errors++;
+    end
+
+
+    if 
+      get_critter_base_stat(dude_obj, STAT_lu) == 
+          get_critter_base_stat(closest_critter, STAT_lu)
+      and
+      get_critter_extra_stat(dude_obj, STAT_max_hit_points) ==
+          get_critter_extra_stat(closest_critter, STAT_max_hit_points) then begin
+        display_msg("FAIL: Very sus eq values for dude and closest critter");
+        test_suite_errors++;
+    end
+
+
+    call test_derived_base_stat_critter(dude_obj);
+    call test_derived_base_stat_critter(closest_critter);
+
+    call report_test_results("stats");
+    
+
+    // set_pc_base_stat(STAT_lu, 10);
+    // set_pc_extra_stat(STAT_max_hit_points, 500);
+end

sfall_testing/test.ini

@@ -0,0 +1,16 @@
+[ValidSection]
+Key1=Value1
+Key2=2
+
+[SectionWithSpaces]
+  LeadingSpaceKey = LeadingSpaceValue
+TrailingSpaceKey  =  TrailingSpaceValue
+  Both Sides Space Key  =  Both Sides Space Value
+SimpleKey=SimpleValue
+
+[EmptySection]
+
+; This is TestMisc, it's not empty but won't be directly tested for content here.
+[TestMisc]
+Alpha=Beta
+Gamma=Delta

sfall_testing/test_utils.h

@@ -0,0 +1,123 @@
+#ifndef TEST_UTILS_H
+#define TEST_UTILS_H
+
+#include "define_lite.h"
+
+variable test_suite_errors := 0;
+variable test_suite_verbose := false;
+variable test_suite_assertions := 0;
+
+procedure assertTrue(variable desc, variable a) begin
+   test_suite_assertions++;
+
+   if (not a) then begin
+      display_msg("Assertion failed \""+desc+"\": is not true");
+      test_suite_errors ++;
+   end else if (test_suite_verbose) then begin
+      display_msg("Assert \""+desc+"\" ok");
+   end
+end
+
+procedure assertEquals(variable desc, variable a, variable b) begin
+   test_suite_assertions++;
+
+   if (a != b or typeof(a) != typeof(b)) then begin
+      display_msg("FAIL \""+desc+"\": "+a+" != "+b);
+      test_suite_errors ++;
+   end else if (test_suite_verbose) then begin
+      display_msg("ok \""+desc+"\"");
+   end
+end
+
+procedure assertNotEquals(variable desc, variable a, variable b) begin
+   test_suite_assertions++;
+
+   if (a == b) then begin
+      display_msg("FAIL \""+desc+"\": "+a+" == "+b);
+      test_suite_errors ++;
+   end else if (test_suite_verbose) then begin
+      display_msg("ok \""+desc+"\"");
+   end
+end
+
+
+procedure assertFloat(variable desc, variable a, variable b, variable tolerance = 0.001) begin
+   test_suite_assertions++;
+
+   variable diff := abs(a - b);
+   if (diff > tolerance) then begin
+      display_msg("FAIL \""+desc+"\": "+a+" != "+b+" (diff: "+diff+")");
+      test_suite_errors ++;
+   end else if (test_suite_verbose) then begin
+      display_msg("ok \""+desc+"\"");
+   end
+end
+
+procedure report_test_results(variable desc) begin
+   
+   display_msg("DONE " + desc + " " + 
+     (test_suite_assertions-test_suite_errors) + "/" + test_suite_assertions + "");
+   display_msg("================");
+
+
+   #define GL_VAR_TESTING_INFO_ARRAY_ID "TestArra"
+   #define TEST_ARR_IDENTIFIER_KEY "__testing_info_array__"
+   variable arr_id = get_sfall_global_int(GL_VAR_TESTING_INFO_ARRAY_ID);
+   if arr_id != 0 then begin
+      // Let's check that it is actually our testing array
+      if array_key(arr_id, -1) == 0 then begin
+         // It is not even associative array, so it is not our testing array
+         arr_id = 0;
+      end else begin
+         if arr_id[TEST_ARR_IDENTIFIER_KEY] != 1 then begin
+            // It is associative array, but it is not our testing array
+            arr_id = 0;
+         end
+      end
+   end
+   if arr_id == 0 then begin
+      arr_id = create_array(-1, 0);
+      arr_id[TEST_ARR_IDENTIFIER_KEY] = 1;
+      set_sfall_global(GL_VAR_TESTING_INFO_ARRAY_ID, arr_id);
+   end
+
+
+   #define TEST_SUITES "Test suites"
+   #define TEST_ASSERTIONS_TOTAL "Tests assertings total"
+   #define TEST_ASSERTIONS_FAILED "Tests assertings failed"
+   
+   if arr_id[TEST_SUITES] == 0 then begin
+      arr_id[TEST_SUITES] = create_array(-1, 0);
+   end
+
+   //set_sfall_global("test_suite_errors", test_suite_errors);
+   
+   arr_id[TEST_ASSERTIONS_TOTAL] += test_suite_assertions;
+   arr_id[TEST_ASSERTIONS_FAILED] += test_suite_errors;
+   arr_id[TEST_SUITES][desc] += 1;
+
+   variable total_suites_names = "";
+   variable total_suites_count = 0;
+
+   variable key, item;
+   foreach (key: item in arr_id[TEST_SUITES]) begin
+      total_suites_count += item;
+      if (total_suites_names != "") then begin
+         total_suites_names += ", ";
+      end
+      total_suites_names += key;
+   end
+   
+
+   variable assertions_stats_str = (arr_id[TEST_ASSERTIONS_TOTAL]-arr_id[TEST_ASSERTIONS_FAILED]) + 
+      "/" + arr_id[TEST_ASSERTIONS_TOTAL];
+   if (arr_id[TEST_ASSERTIONS_FAILED] == 0) then begin
+      float_msg(dude_obj, "Tested " + total_suites_count + " cases: " + total_suites_names + ". " +
+          assertions_stats_str + " assertions passed!", FLOAT_MSG_GREEN);
+   end else begin
+      float_msg(dude_obj, "Tested " + total_suites_count + " cases: " + total_suites_names + ". " +
+          assertions_stats_str + " assertions passed", FLOAT_MSG_RED);
+   end
+end
+
+#endif

src/animation.cc

@@ -3046,6 +3046,10 @@ void _dude_fidget()
         return;
     }
 
+    if (GameMode::getCurrentGameMode() == GameMode::kWorldmap) {
+        return;
+    }
+
     if (isInCombat()) {
         return;
     }

src/character_editor.cc

@@ -789,62 +789,6 @@ struct CustomKarmaFolderDescription {
 static std::vector<CustomKarmaFolderDescription> gCustomKarmaFolderDescriptions;
 static std::vector<TownReputationEntry> gCustomTownReputationEntries;
 
-/* Explaining characterEditorSelectedItem
-
-0-6: Primary Stats (SPECIAL)
-
-  - 0-6 = The seven primary stats (Strength, Perception, Endurance, Charisma, Intelligence, Agility, Luck)
-  - Used for highlighting which SPECIAL stat is selected
-
-  7-9: Level/Experience Area
-
-  - 7 = Level display
-  - 8 = Experience points display
-  - 9 = Experience needed for next level
-
-  10-42: Folder Content Area (Perks/Karma/Kills)
-
-  - 10-42 = Items within the currently selected folder tab (perks, karma, or kills)
-  - 10 = First visible item in the folder
-  - The actual content depends on which folder is active (characterEditorWindowSelectedFolder)
-  - This is the range where mouse wheel scrolling is active
-  - When scrolling, items shift but the selection stays within this range
-
-  43-50: Status Conditions
-
-  - 43 = Hit Points (EDITOR_HIT_POINTS)
-  - 44 = Poisoned status (EDITOR_POISONED)
-  - 45 = Radiated status (EDITOR_RADIATED)
-  - 46 = Eye damage (EDITOR_EYE_DAMAGE)
-  - 47 = Crippled right arm (EDITOR_CRIPPLED_RIGHT_ARM)
-  - 48 = Crippled left arm (EDITOR_CRIPPLED_LEFT_ARM)
-  - 49 = Crippled right leg (EDITOR_CRIPPLED_RIGHT_LEG)
-  - 50 = Crippled left leg (EDITOR_CRIPPLED_LEFT_LEG)
-
-  51-60: Derived Stats
-
-  - 51-60 = The 10 derived stats (EDITOR_FIRST_DERIVED_STAT + EDITOR_DERIVED_STAT_*)
-  - Armor Class, Action Points, Carry Weight, Melee Damage, etc.
-
-  61-78: Skills
-
-  - 61-78 = The 18 skills (EDITOR_FIRST_SKILL to EDITOR_FIRST_SKILL + SKILL_COUNT)
-  - Small Guns, Big Guns, Energy Weapons, Unarmed, etc.
-  - characterEditorSelectedItem - 61 gives the actual skill index
-
-  79-81: Skill Controls
-
-  - 79 = Tag Skill button (EDITOR_TAG_SKILL)
-  - 80 = Skills header/button (EDITOR_SKILLS)
-  - 81 = Optional Traits button (EDITOR_OPTIONAL_TRAITS)
-
-  82-97: Optional Traits
-
-  - 82-97 = The 16 trait slots (EDITOR_FIRST_TRAIT to EDITOR_FIRST_TRAIT + TRAIT_COUNT)
-  - Fast Metabolism, Bruiser, Small Frame, etc.
-  - Can be arranged in 2 columns (left: 82-89, right: 90-97)
-*/
-
 // 0x431DF8
 int characterEditorShow(bool isCreationMode)
 {
@@ -882,20 +826,7 @@ int characterEditorShow(bool isCreationMode)
         _frame_time = getTicks();
         int keyCode = inputGetInput();
 
-        // check for mouse wheel over the "folder" area (perks/karma/kills)
-        if (keyCode == -1 && (mouseGetEvent() & MOUSE_EVENT_WHEEL) != 0 && !gCharacterEditorIsCreationMode && mouseHitTestInWindow(gCharacterEditorWindow, 34, 364, 314, 364 + 9 * (fontGetLineHeight() + 1))) {
-            int wheelX, wheelY;
-            mouseGetWheel(&wheelX, &wheelY);
-            if (wheelY > 0) { // Scroll up
-                characterEditorFolderViewScroll(-1);
-            } else if (wheelY < 0) { // Scroll down
-                characterEditorFolderViewScroll(1);
-            }
-            characterEditorDrawCard();
-            windowRefresh(gCharacterEditorWindow);
-        } else {
-            convertMouseWheelToArrowKey(&keyCode);
-        }
+        convertMouseWheelToArrowKey(&keyCode);
 
         bool done = false;
         if (keyCode == 500) {
@@ -1838,7 +1769,7 @@ static int characterEditorWindowInit()
 
     btn = buttonCreate(
         gCharacterEditorWindow,
-        343,
+        344, // one pixel right shift to align with background
         454,
         _editorFrmImages[EDITOR_GRAPHIC_LITTLE_RED_BUTTON_UP].getWidth(),
         _editorFrmImages[EDITOR_GRAPHIC_LITTLE_RED_BUTTON_UP].getHeight(),
@@ -1856,7 +1787,7 @@ static int characterEditorWindowInit()
 
     btn = buttonCreate(
         gCharacterEditorWindow,
-        552,
+        553, // one pixel right shift to align with background
         454,
         _editorFrmImages[EDITOR_GRAPHIC_LITTLE_RED_BUTTON_UP].getWidth(),
         _editorFrmImages[EDITOR_GRAPHIC_LITTLE_RED_BUTTON_UP].getHeight(),
@@ -1874,7 +1805,7 @@ static int characterEditorWindowInit()
 
     btn = buttonCreate(
         gCharacterEditorWindow,
-        455,
+        456, // one pixel right shift to align with background
         454,
         _editorFrmImages[23].getWidth(),
         _editorFrmImages[23].getHeight(),

src/font_manager.cc

@@ -6,6 +6,7 @@
 #include "color.h"
 #include "db.h"
 #include "memory_manager.h"
+#include "settings.h"
 
 // The maximum number of interface fonts.
 #define INTERFACE_FONT_MAX (16)
@@ -119,11 +120,25 @@ static int interfaceFontLoad(int font_index)
     InterfaceFontDescriptor* fontDescriptor = &(gInterfaceFontDescriptors[font_index]);
 
     char path[56];
-    snprintf(path, sizeof(path), "font%d.aaf", font_index);
+    File* stream = nullptr;
 
-    File* stream = fileOpen(path, "rb");
+    // Try set language path first
+    snprintf(path, sizeof(path), "text/%s/font%d.aaf", settings.system.language.c_str(), font_index);
+    stream = fileOpen(path, "rb");
+
+    // Fallback to English if needed
+    if (stream == nullptr && compat_stricmp(settings.system.language.c_str(), ENGLISH) != 0) {
+        snprintf(path, sizeof(path), "text/%s/font%d.aaf", ENGLISH, font_index);
+        stream = fileOpen(path, "rb");
+    }
+
+    // Fallback to original path
     if (stream == nullptr) {
-        return -1;
+        snprintf(path, sizeof(path), "font%d.aaf", font_index);
+        stream = fileOpen(path, "rb");
+        if (stream == nullptr) {
+            return -1;
+        }
     }
 
     int fileSize = fileGetSize(stream);

src/game_dialog.cc

@@ -3241,12 +3241,12 @@ int _gdialog_barter_create_win()
     backgroundFrmImage.unlock();
 
     // TRADE
-    _gdialog_buttons[0] = buttonCreate(gGameDialogWindow, 40, 162, 14, 14, -1, -1, -1, KEY_LOWERCASE_M, _redButtonNormalFrmImage.getData(), _redButtonPressedFrmImage.getData(), nullptr, BUTTON_FLAG_TRANSPARENT);
+    _gdialog_buttons[0] = buttonCreate(gGameDialogWindow, 40, 163, 14, 14, -1, -1, -1, KEY_LOWERCASE_M, _redButtonNormalFrmImage.getData(), _redButtonPressedFrmImage.getData(), nullptr, BUTTON_FLAG_TRANSPARENT);
     if (_gdialog_buttons[0] != -1) {
         buttonSetCallbacks(_gdialog_buttons[0], _gsound_med_butt_press, _gsound_med_butt_release);
 
         // TALK
-        _gdialog_buttons[1] = buttonCreate(gGameDialogWindow, 583, 161, 14, 14, -1, -1, -1, KEY_LOWERCASE_T, _redButtonNormalFrmImage.getData(), _redButtonPressedFrmImage.getData(), nullptr, BUTTON_FLAG_TRANSPARENT);
+        _gdialog_buttons[1] = buttonCreate(gGameDialogWindow, 583, 162, 14, 14, -1, -1, -1, KEY_LOWERCASE_T, _redButtonNormalFrmImage.getData(), _redButtonPressedFrmImage.getData(), nullptr, BUTTON_FLAG_TRANSPARENT);
         if (_gdialog_buttons[1] != -1) {
             buttonSetCallbacks(_gdialog_buttons[1], _gsound_med_butt_press, _gsound_med_butt_release);
 

src/game_sound.cc

@@ -69,6 +69,7 @@ static bool gSoundEffectsEnabled = false;
 static int _gsound_active_effect_counter;
 
 // 0x518E50
+// background music
 static Sound* gBackgroundSound = nullptr;
 
 // 0x518E54
@@ -593,9 +594,32 @@ int backgroundSoundGetDuration()
     return soundGetDuration(gBackgroundSound);
 }
 
-// [fileName] is base file name, without path and extension.
-//
-// 0x45067C
+/*
+    [fileName] is base file name, without path and extension.
+
+    a2
+        10 = don't auto play sound after load (unused?)
+        11 = set read limit before soundLoad, !11 = set after soundLoad
+        12 = usually used when value is not 11
+    a3 relates to sound type
+        13 = MEMORY
+        14 = STREAMING
+    a4 relates to sound flags
+        15 = fire and forget
+        16 = looping
+
+    examples:
+        backgroundSoundLoad("akiss", 12, 14, 15) (endgame)
+        backgroundSoundLoad("10labone", 11, 14, 16); (endgame)
+        backgroundSoundLoad(fileName, a2, 14, 16); (map music) // 11 = main menu music, 12 = map/world map music
+        backgroundSoundLoad("wind2", 12, 13, 16); (map load sound)
+
+        these use the last settings for a3/a4 that were passed to backgroundSoundLoad
+        backgroundSoundRestart(11); (end of of script)
+        backgroundSoundRestart(12); (game init, volume change)
+
+    0x45067C
+*/
 int backgroundSoundLoad(const char* fileName, int a2, int a3, int a4)
 {
     int rc;
@@ -750,7 +774,7 @@ int _gsound_background_play_level_music(const char* fileName, int a2)
 {
     int gaplessMusic = 0;
     configGetInt(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_GAPLESS_MUSIC, &gaplessMusic);
-    if (gaplessMusic) {
+    if (backgoundSoundIsPlaying() && gaplessMusic) {
         if (!strcmp(fileName, gBackgroundSoundFileName)) {
             return 0;
         }
@@ -802,6 +826,12 @@ void backgroundSoundResume()
     }
 }
 
+// TODO: could be made more precise by querying the sound, checking volume, &c.
+bool backgoundSoundIsPlaying()
+{
+    return gBackgroundSound != nullptr;
+}
+
 // NOTE: Inlined.
 //
 // 0x450B78
@@ -1688,6 +1718,8 @@ void soundEffectCallback(void* userData, int a2)
 }
 
 // 0x451ADC
+// a2 relates to sound type
+// a3 relates to sound flags
 int _gsound_background_allocate(Sound** soundPtr, int a2, int a3)
 {
     int soundFlags = SOUND_FLAG_0x02 | SOUND_16BIT;