Add executable to make it work in vs2019

Add single-commit option for preview deployments

.github/workflows/auto-format.yml

@@ -0,0 +1,42 @@
+name: Auto Format with Clang
+
+on: 
+  pull_request:
+    types: [opened, synchronize]
+  push:
+    branches: [main]
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    if: github.actor != 'github-actions[bot]' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref || github.ref_name  }}
+          token: ${{ secrets.PAT_FOR_ACTIONS }}
+
+      - name: Run clang-format via Docker
+        run: |
+          docker run --rm \
+            -v ${{ github.workspace }}:/app --workdir /app  \
+            --user $(id -u):$(id -g) silkeh/clang:18 \
+            bash -c 'find src -type f \( -name "*.cc" -o -name "*.h" \) -print0 | xargs -0 clang-format -i'
+
+
+      # https://github.com/actions/checkout?tab=readme-ov-file#push-a-commit-to-a-pr-using-the-built-in-token
+      - name: Check and commit changes if needed
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+          if ! git diff --quiet; then
+            git diff
+            git commit -am "chore: auto-format with clang-format"
+            git push
+          else
+            echo "No formatting changes"
+          fi
+
+    

.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

@@ -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-v3
 
       - 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: |

CMakeLists.txt

@@ -24,8 +24,10 @@ option(FALLOUT_VENDORED "Use vendored third-party libraries" ON)
 
 if(ANDROID)
     add_library(${EXECUTABLE_NAME} SHARED)
+elseif(APPLE)
+    add_executable(${EXECUTABLE_NAME} MACOSX_BUNDLE)
 else()
-    add_executable(${EXECUTABLE_NAME} WIN32 MACOSX_BUNDLE)
+    add_executable(${EXECUTABLE_NAME})
 endif()
 
 # Git Info

CMakePresets.json

@@ -74,7 +74,8 @@
                 "CMAKE_CXX_FLAGS": "-m32",
                 "CMAKE_SYSTEM_NAME": "Linux",
                 "CMAKE_SYSTEM_PROCESSOR": "i386"
-            }
+            },
+            "generator": "Unix Makefiles"
         },
         {
             "name": "linux-x86-debug",

README.md

@@ -141,6 +141,17 @@ The third configuration file is `ddraw.ini` (part of Sfall). There are dozens of
 
 For a sample ddraw.ini configuration file, containing all currently working settings use this link: [ddraw.ini](https://raw.githubusercontent.com/fallout2-ce/fallout2-ce/refs/heads/main/files/ddraw.ini)
 
+## Quality of life benefits over vanilla Fallout
+
+* High resolution support
+* Increased pathfinding nodes 5x for more accurate pathfinding
+* Ctrl-click to quickly move items when bartering, looting, or stealing
+* _a_ to select "all" when selecting item quantity
+* _a_ to `Take All` when looting
+* When bartering, caps default to the right amount to balance the trade (if possible)
+* Music continues playing between maps (requires config)
+* Auto open doors (requires config)
+
 ## Contributing
 
 Integrating Sfall goodies is the top priority. Quality of life updates are OK too. Please no large scale refactorings at this time as we need to reconcile changes from Reference Edition, which will make this process slow and error-prone. In any case open up an issue with your suggestion or to notify other people that something is being worked on.

fix_formatting.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+docker run --rm \
+  -v $(pwd):/app --workdir /app  \
+  --user $(id -u):$(id -g) silkeh/clang:18 \
+  bash -c 'find src -type f -name \*.cc -o -name \*.h | xargs clang-format -i'
+

sfall_testing/.gitignore

@@ -0,0 +1 @@
+*.int

sfall_testing/README.md

@@ -0,0 +1,51 @@
+# Testing sFall scripting features
+
+## Basic info
+
+This folder contains scripts which can be used for sFall opcodes.
+
+## Building
+
+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:
+
+```sh
+compile.exe -q -p -l -O2 -d -s -n -I<sfall_headers_id> <script_name.ssl>
+```
+
+(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)
+
+
+
+## Run test script
+
+1. Move compiled `.int` file into game folder as `data/scripts/gl_<script_name>.int`
+
+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
+
+

sfall_testing/gl_test_arrays.ssl

@@ -0,0 +1,181 @@
+#include "lib.arrays.h"
+#include "test_utils.h"
+// #include "define_lite.h"
+
+
+
+#define ARRAY_MAX_STRING	   (255)
+#define ARRAY_MAX_SIZE		 (100000)
+
+procedure array_test_suite begin
+   variable arr, i, arr2, map, k, v, s;
+   test_suite_errors := 0;
+
+   display_msg("Testing arrays_equal functions...");
+   call assertEquals("array_equals 1", arrays_equal([9, 7, 2, 1], [9, 7, 2, 1]), true);
+   call assertEquals("array_equals 2", arrays_equal([9, 7, 0, 1], [9, 7, 2, 1]), false);
+   call assertEquals("array_equals 3", arrays_equal([1, 1, 1, 1], [1, 1, 1]), false);
+   call assertEquals("array_equals 4", arrays_equal([], []), true);
+   call assertEquals("array_equals 5", arrays_equal({}, []), false);
+   call assertEquals("array_equals 6", arrays_equal({1: 1.0, 2: 2.0}, {1: 1.000, 2: 2.000}), true);
+   call assertEquals("array_equals 7", arrays_equal({"name": "John", "dept": 15.20}, {"name": "John"}), false);
+
+
+   display_msg("Testing utility functions...");
+   call assertEquals("strlen", strlen("testing"), 7);
+   call assertEquals("substr 1", substr("testing", 4, 2), "in");
+   call assertEquals("substr 2", substr("testing", 1, -1), "estin");
+   call assertEquals("substr 3", substr("testing", -5, 5), "sting");
+   call assertEquals("typeof 1", typeof(1), VALTYPE_INT);
+   call assertEquals("typeof 2", typeof(1.0), VALTYPE_FLOAT);
+   call assertEquals("typeof 3", typeof("1.0"), VALTYPE_STR);
+
+   // Basic array functionality
+   display_msg("Testing basic arrays functionality...");
+   arr := create_array(5,0);
+   call assertEquals("array size", len_array(arr), 5);
+   arr[0]:=100;
+   call assertEquals("get array", get_array(arr, 0), 100);
+   arr[1]:=5.555;
+   call assertEquals("get array float", get_array(arr, 1), 5.555);
+   arr[2]:="hello";
+   call assertEquals("get array str", get_array(arr, 2), "hello");
+   call assertEquals("get array invalid index", get_array(arr, -1), 0);
+   call assertEquals("get array invalid index", get_array(arr, 6), 0);
+   resize_array(arr, 77);
+   call assertEquals("list resize", len_array(arr), 77);
+   resize_array(arr, ARRAY_MAX_SIZE + 100);
+   call assertEquals("resize max", len_array(arr), ARRAY_MAX_SIZE);
+   free_array(arr);
+   call assertEquals("not exists check", len_array(arr), -1);
+   arr := create_array(ARRAY_MAX_SIZE + 100, 0);
+   call assertEquals("create max", len_array(arr), ARRAY_MAX_SIZE);
+
+   free_array(arr);
+   arr := [6, 1, 10, "one", 10, "two", 5, "three"];
+   arr[0] := "wtf";
+   //display_msg(debug_array_str(arr));
+   call assertEquals("scan list", scan_array(arr, 10), 2);
+   call assertEquals("scan list 2", scan_array(arr, "two"), 5);
+   call assertEquals("array_key", array_key(arr, 5), 5);
+   call assertEquals("array_key out of range", array_key(arr, 9), 0);
+   call assertEquals("is list", array_key(arr, -1), 0);
+
+   call assertEquals("get array as substr", get_array("NiCe", 1), "i");
+
+   arr := [78, 12, 99, 1, -5];
+   sort_array(arr);
+   call assertEquals("sort ASC", arrays_equal(arr, [-5, 1, 12, 78, 99]), true);
+
+   arr := ["Albert", "John", "Mike", "David"];
+   sort_array_reverse(arr);
+   call assertEquals("sort DESC", arrays_equal(arr, ["Mike", "John", "David", "Albert"]), true);
+   reverse_array(arr);
+   call assertEquals("reverse list", arrays_equal(arr, ["Albert", "David", "John", "Mike"]), true);
+   shuffle_array(arr);
+   call assertEquals("shuffle list 1", arrays_equal(arr, ["Albert", "David", "John", "Mike"]), false);
+   call assertEquals("shuffle list 2", len_array(arr), 4);
+   if (test_suite_verbose) then display_array(arr);
+
+   // some additional stuff
+   call assertEquals("string_split", get_array(string_split("this+is+good", "+"), 2), "good");
+   call assertEquals("string_split 2", len_array(string_split("advice", "")), 6);
+   s := "";
+   for (i := 0; i < ARRAY_MAX_STRING+30; i+=10) begin
+      s += "Verbosity.";
+   end
+   arr[0] := s;
+   call assertEquals("array max string", strlen(arr[0]), ARRAY_MAX_STRING-1);
+
+   // ASSOC ARRAYS TEST
+   display_msg("Testing associative arrays...");
+   arr := create_array(-1,0);
+   call assertEquals("is map", array_key(arr, -1), 1);
+   call assertEquals("exists check", len_array(arr), 0);
+   arr["123"] := 100;
+   call assertEquals("set/get str=>int", arr["123"], 100);
+   arr["123"] := 50;
+   call assertEquals("overwrite 1", arr["123"], 50);
+   call assertEquals("overwrite 2", len_array(arr), 1);
+   arr[-1] := "wtf";
+   call assertEquals("set/get int=>str", arr[-1], "wtf");
+   arr[3.14] := 0.00001;
+   call assertEquals("set/get float=>float", arr[3.14], 0.00001);
+   arr["fourth"] := "elem";
+   call assertEquals("map size", len_array(arr), 4);
+   arr[-1] := 0;
+   call assertEquals("unset key: length", len_array(arr), 3);
+   call assertEquals("unset key: hashmap", arr[3.14], 0.00001);
+   call assertEquals("key not exist", arr[777], 0);
+   free_array(arr);
+   call assertEquals("not exists check", len_array(arr), -1);
+   arr := {6:5, 1.001:0.5, 10:"A", 5:0, "wtf":1.1, 10:0.0001, "some":"What"}; // 7 here
+   // 10:"A" will be overwritten by 10:0.0001
+   call assertEquals("assoc array expr", len_array(arr), 6); // 6 actual
+
+   call assertEquals("scan map 1", scan_array(arr, 1.1), "wtf");
+   call assertEquals("scan map 2", scan_array(arr, 5), 6);
+   call assertEquals("scan map 3", scan_array(arr, "What"), "some");
+   call assertEquals("array_key 1", array_key(arr, 0), 6);
+   call assertEquals("array_key 2", array_key(arr, 4), "wtf");
+   call assertEquals("array_key 3", array_key(arr, 1), 1.001);
+
+   resize_array(arr, 2);
+   call assertEquals("map resize 1", len_array(arr), 2);
+   call assertEquals("map resize 2", arrays_equal(arr, {6:5, 1.001:0.5}), true);
+   resize_array(arr, 0);
+   call assertEquals("map clear", len_array(arr), 0);
+
+   display_msg("Testing foreach...");
+   s := "ar";
+   arr := [6, 10, 0.5, "wtf"];
+   foreach v in arr begin
+      s += v;
+   end
+   call assertEquals("foreach 1", s, "ar6100.50000wtf");
+   s := "ar2=";
+   arr := {"name": "John", "hp": 25, 0: 5.5};
+   foreach k: v in arr begin
+      s += k+":"+v+";";
+   end
+   call assertEquals("foreach 2", s, "ar2=name:John;hp:25;0:5.50000;");
+
+
+     /*
+   display_msg("Testing save/load...");
+   arr := [2,1];
+   arr2 := {1:2};
+   save_array("myarray", arr);
+   call assertEquals("load 1", load_array("myarray"), arr);
+   save_array("myarray", arr2);
+   call assertEquals("load 2", load_array("myarray"), arr2);
+   free_array(arr2);
+   call assertEquals("not exists check", len_array(arr2), -1);
+   call assertEquals("load fail", load_array("myarray"), 0);
+   save_array(0.1, arr);
+   call assertEquals("save as float", load_array(0.1), arr);
+   arr2 := list_saved_arrays; // list of array names
+   //display_msg(debug_array_str(arr2));
+   call assertNotEquals("saved arrays 1", scan_array(arr2, 0.1), -1);
+   call assertEquals("saved arrays 2", scan_array(arr2, "myarray"), -1);
+   save_array(0, arr);
+   call assertEquals("unsave array 1", load_array(0.1), 0);
+   call assertEquals("unsave array 2", len_array(arr), 2);
+   call assertEquals("saved arrays 3", len_array(list_saved_arrays), len_array(arr2) - 1);
+   */
+
+   display_msg("All tests finished with "+test_suite_errors+" errors.");
+
+   call report_test_results("Arrays");
+end
+
+
+
+
+
+
+
+procedure start begin
+   display_msg("Starting tests");
+   call array_test_suite();
+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_utils.h

@@ -0,0 +1,47 @@
+#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 assertEquals(variable desc, variable a, variable b) begin
+   test_suite_assertions++;
+
+   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
+   test_suite_assertions++;
+
+   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
+
+procedure report_test_results(variable desc) begin
+   
+   display_msg("DONE " + desc + " " + 
+     (test_suite_assertions-test_suite_errors) + "/" + test_suite_assertions + "");
+   display_msg("================");
+
+   if (test_suite_errors == 0) then begin
+      float_msg(dude_obj, desc + " tests passed " + 
+         (test_suite_assertions-test_suite_errors) + "/" +test_suite_assertions + "!", FLOAT_MSG_GREEN);        
+   end else begin
+      float_msg(dude_obj, desc + " failed " + test_suite_errors + " tests from " +
+         test_suite_assertions + "!", 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

@@ -1769,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(),
@@ -1787,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(),
@@ -1805,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/draw.cc

@@ -1,8 +1,6 @@
 #include "draw.h"
 
-#include <cstring>
 #include <string.h>
-#include <vector>
 
 #include "color.h"
 #include "svga.h"
@@ -341,53 +339,4 @@ void transSrcCopy(unsigned char* dest, int destPitch, unsigned char* src, int sr
     }
 }
 
-void blitBufferToBufferStretchAndFixEdges(
-    unsigned char* src, int srcW, int srcH, int srcPitch,
-    unsigned char* dst, int dstW, int dstH, int dstPitch,
-    int numStates)
-{
-    // Temp buffer for over-stretched result (per state)
-    const int stretchW = dstW + 1;
-    const int stretchH = dstH + 1;
-    const int stretchPitch = stretchW;
-
-    std::vector<unsigned char> tempBuffer(stretchW * stretchH * numStates);
-
-    // Stretch all states to slightly larger temp buffer
-    blitBufferToBufferStretch(
-        src, srcW, srcH * numStates, srcPitch,
-        tempBuffer.data(), stretchW, stretchH * numStates, stretchPitch);
-
-    // Now copy only the top-left dstW x dstH portion per state into the final buffer
-    for (int state = 0; state < numStates; ++state) {
-        unsigned char* tempFrame = tempBuffer.data() + stretchW * stretchH * state;
-        unsigned char* finalFrame = dst + dstW * dstH * state;
-
-        for (int y = 0; y < dstH; ++y) {
-            memcpy(
-                finalFrame + y * dstW,
-                tempFrame + y * stretchPitch,
-                dstW);
-        }
-    }
-}
-
-void calculateScaledSize(int srcWidth, int srcHeight, int targetWidth, int targetHeight, int mode, int& outWidth, int& outHeight)
-{
-    if (mode == 2) {
-        // Fullscreen stretch
-        outWidth = targetWidth;
-        outHeight = targetHeight;
-    } else {
-        // Maintain aspect ratio
-        if (targetHeight * srcWidth >= targetWidth * srcHeight) {
-            outWidth = targetWidth;
-            outHeight = (targetWidth * srcHeight) / srcWidth;
-        } else {
-            outWidth = (targetHeight * srcWidth) / srcHeight;
-            outHeight = targetHeight;
-        }
-    }
-}
-
 } // namespace fallout

src/draw.h

@@ -17,11 +17,6 @@ void _swap_color_buf(unsigned char* buf, int width, int height, int pitch, int c
 void bufferOutline(unsigned char* buf, int width, int height, int pitch, int a5);
 void srcCopy(unsigned char* dest, int destPitch, unsigned char* src, int srcPitch, int width, int height);
 void transSrcCopy(unsigned char* dest, int destPitch, unsigned char* src, int srcPitch, int width, int height);
-void blitBufferToBufferStretchAndFixEdges(
-    unsigned char* src, int srcW, int srcH, int srcPitch,
-    unsigned char* dst, int dstW, int dstH, int dstPitch,
-    int numStates = 1);
-void calculateScaledSize(int srcWidth, int srcHeight, int targetWidth, int targetHeight, int mode, int& outWidth, int& outHeight);
 
 } // namespace fallout
 

src/game.cc

@@ -123,7 +123,7 @@ MessageList gMiscMessageList;
 static void** gGameGlobalPointers = nullptr;
 
 // 0x442580
-int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4, int argc, char** argv)
+int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int flags, int argc, char** argv)
 {
     char path[COMPAT_MAX_PATH];
 
@@ -150,7 +150,7 @@ int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4
     messageListRepositoryInit();
 
     programWindowSetTitle(windowTitle);
-    _initWindow(1, a4);
+    _initWindow(1, flags);
     paletteInit();
 
     const char* language = settings.system.language.c_str();
@@ -168,14 +168,6 @@ int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4
     int skipOpeningMovies = 0;
     configGetInt(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_SKIP_OPENING_MOVIES_KEY, &skipOpeningMovies);
 
-    // load preferences before Splash screen to get proper brightness
-    if (_init_options_menu() != 0) {
-        debugPrint("Failed on init_options_menu\n");
-        return -1;
-    }
-
-    debugPrint(">init_options_menu\n");
-
     if (!gIsMapper && skipOpeningMovies < 2) {
         showSplash();
     }
@@ -349,7 +341,7 @@ int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4
 
     debugPrint(">scr_disable\t");
 
-        if (_init_options_menu() != 0) {
+    if (_init_options_menu() != 0) {
         debugPrint("Failed on init_options_menu\n");
         return -1;
     }
@@ -1201,139 +1193,71 @@ static void gameFreeGlobalVars()
 // 0x443F74
 static void showHelp()
 {
-    ScopedGameMode gm(GameMode::kHelp); // Switch to Help game mode.
+    ScopedGameMode gm(GameMode::kHelp);
 
     bool isoWasEnabled = isoDisable();
     gameMouseObjectsHide();
+
     gameMouseSetCursor(MOUSE_CURSOR_NONE);
 
     bool colorCycleWasEnabled = colorCycleEnabled();
     colorCycleDisable();
 
-    // load the optional stretch setting from f2_res.ini
-    int helpScreenStretchMode = 0;
-    int stretchGameMode = 0;
-    Config config;
-    if (configInit(&config)) {
-        if (configRead(&config, "f2_res.ini", false)) {
-            configGetInt(&config, "STATIC_SCREENS", "HELP_SCRN_SIZE", &helpScreenStretchMode);
+    // CE: Help screen uses separate color palette which is incompatible with
+    // colors in other windows. Setup overlay to hide everything.
+    int overlay = windowCreate(0, 0, screenGetWidth(), screenGetHeight(), 0, WINDOW_HIDDEN | WINDOW_MOVE_ON_TOP);
 
-            if (configGetInt(&config, "STATIC_SCREENS", "STRETCH_GAME", &stretchGameMode)) {
-                helpScreenStretchMode = stretchGameMode; // always override if key exists
-            }
-        }
-        configFree(&config);
-    }
-
-    int screenWidth = screenGetWidth();
-    int screenHeight = screenGetHeight();
-
-    // Create an invisible fullscreen overlay window to cover everything.
-    int overlay = windowCreate(0, 0, screenWidth, screenHeight, 0, WINDOW_HIDDEN | WINDOW_MOVE_ON_TOP);
-
-    FrmImage helpFrmImage;
-    int helpFid = buildFid(OBJ_TYPE_INTERFACE, 297, 0, 0, 0); // Load Help screen graphic (FID 297).
-    if (!helpFrmImage.lock(helpFid)) {
-        if (colorCycleWasEnabled)
-            colorCycleEnable();
-        gameMouseObjectsShow();
-        if (isoWasEnabled)
-            isoEnable();
-        return;
-    }
-
-    unsigned char* helpData = helpFrmImage.getData();
-    int helpWidth = HELP_SCREEN_WIDTH;
-    int helpHeight = HELP_SCREEN_HEIGHT;
-
-    unsigned char* bufferToBlit = helpData;
-    int blitWidth = helpWidth;
-    int blitHeight = helpHeight;
-
-    // Check if stretching is needed (based on config or screen too small).
-    if (helpScreenStretchMode != 0 || screenWidth < helpWidth || screenHeight < helpHeight) {
-        int scaledWidth, scaledHeight;
-
-        calculateScaledSize(
-            helpWidth,
-            helpHeight,
-            screenWidth,
-            screenHeight,
-            helpScreenStretchMode,
-            scaledWidth,
-            scaledHeight);
-
-        // Allocate memory for the scaled image.
-        unsigned char* scaled = reinterpret_cast<unsigned char*>(internal_malloc((scaledWidth + 1) * (scaledHeight + 1)));
-        if (scaled != nullptr) {
-            // Stretch and fix the original help image into the new buffer.
-            blitBufferToBufferStretchAndFixEdges(
-                helpData, helpWidth, helpHeight, helpWidth, // Source buffer and dimensions
-                scaled, scaledWidth, scaledHeight, scaledWidth, // Destination buffer and dimensions
-                1 // numStates = 1 for a single image
-            );
-
-            bufferToBlit = scaled;
-            blitWidth = scaledWidth;
-            blitHeight = scaledHeight;
-        }
-    }
-
-    // Center the window on the screen.
-    int x = (screenWidth - blitWidth) / 2;
-    int y = (screenHeight - blitHeight) / 2;
-
-    // Create window for the help screen.
-    int win = windowCreate(x, y, blitWidth, blitHeight, 0, WINDOW_HIDDEN | WINDOW_MOVE_ON_TOP);
+    int helpWindowX = (screenGetWidth() - HELP_SCREEN_WIDTH) / 2;
+    int helpWindowY = (screenGetHeight() - HELP_SCREEN_HEIGHT) / 2;
+    int win = windowCreate(helpWindowX, helpWindowY, HELP_SCREEN_WIDTH, HELP_SCREEN_HEIGHT, 0, WINDOW_HIDDEN | WINDOW_MOVE_ON_TOP);
     if (win != -1) {
         unsigned char* windowBuffer = windowGetBuffer(win);
         if (windowBuffer != nullptr) {
-            // Clear palette to black before displaying.
-            paletteSetEntries(gPaletteBlack);
+            FrmImage backgroundFrmImage;
+            int backgroundFid = buildFid(OBJ_TYPE_INTERFACE, 297, 0, 0, 0);
+            if (backgroundFrmImage.lock(backgroundFid)) {
+                paletteSetEntries(gPaletteBlack);
+                blitBufferToBuffer(backgroundFrmImage.getData(), HELP_SCREEN_WIDTH, HELP_SCREEN_HEIGHT, HELP_SCREEN_WIDTH, windowBuffer, HELP_SCREEN_WIDTH);
 
-            // Copy the help image into the window.
-            blitBufferToBuffer(bufferToBlit, blitWidth, blitHeight, blitWidth, windowBuffer, blitWidth);
+                colorPaletteLoad("art\\intrface\\helpscrn.pal");
+                paletteSetEntries(_cmap);
 
-            // Load the help screen's specific palette.
-            colorPaletteLoad("art\\intrface\\helpscrn.pal");
-            paletteSetEntries(_cmap);
+                // CE: Fill overlay with darkest color in the palette. It might
+                // not be completely black, but at least it's uniform.
+                bufferFill(windowGetBuffer(overlay),
+                    screenGetWidth(),
+                    screenGetHeight(),
+                    screenGetWidth(),
+                    intensityColorTable[_colorTable[0]][0]);
 
-            // Fill the overlay with the darkest palette color to hide everything behind.
-            bufferFill(windowGetBuffer(overlay), screenWidth, screenHeight, screenWidth, intensityColorTable[_colorTable[0]][0]);
+                windowShow(overlay);
+                windowShow(win);
 
-            windowShow(overlay);
-            windowShow(win);
+                while (inputGetInput() == -1 && _game_user_wants_to_quit == 0) {
+                    sharedFpsLimiter.mark();
+                    renderPresent();
+                    sharedFpsLimiter.throttle();
+                }
 
-            while (inputGetInput() == -1 && _game_user_wants_to_quit == 0) {
-                sharedFpsLimiter.mark();
-                renderPresent();
-                sharedFpsLimiter.throttle();
+                while (mouseGetEvent() != 0) {
+                    sharedFpsLimiter.mark();
+
+                    inputGetInput();
+
+                    renderPresent();
+                    sharedFpsLimiter.throttle();
+                }
+
+                paletteSetEntries(gPaletteBlack);
             }
-
-            while (mouseGetEvent() != 0) {
-                sharedFpsLimiter.mark();
-                inputGetInput();
-                renderPresent();
-                sharedFpsLimiter.throttle();
-            }
-
-            // Fade back to black.
-            paletteSetEntries(gPaletteBlack);
         }
 
-        // Cleanup
         windowDestroy(overlay);
         windowDestroy(win);
         colorPaletteLoad("color.pal");
         paletteSetEntries(_cmap);
     }
 
-    // Free temporary scaled buffer if it was allocated.
-    if (bufferToBlit != helpData) {
-        internal_free(bufferToBlit);
-    }
-
-    // Restore previous state.
     if (colorCycleWasEnabled) {
         colorCycleEnable();
     }
@@ -1447,7 +1371,7 @@ static int gameDbInit()
     char* path_file_name_template = nullptr;
     configGetString(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_PATCH_FILE, &path_file_name_template);
     if (path_file_name_template == nullptr || *path_file_name_template == '\0') {
-        path_file_name_template = "patch%03d.dat";
+        path_file_name_template = (char*)"patch%03d.dat";
     }
 
     for (patch_index = 0; patch_index < 1000; patch_index++) {
@@ -1470,9 +1394,8 @@ static int gameDbInit()
 // 0x444384
 static void showSplash()
 {
-    int splashIndex = settings.system.splash;
+    int splash = settings.system.splash;
 
-    // path to local splash folder
     char path[64];
     const char* language = settings.system.language.c_str();
     if (compat_stricmp(language, ENGLISH) != 0) {
@@ -1481,19 +1404,19 @@ static void showSplash()
         snprintf(path, sizeof(path), "art\\splash\\");
     }
 
-    // open a splash file, cycle through SPLASH_COUNT entries
-    File* stream = nullptr;
-    for (int attempt = 0; attempt < SPLASH_COUNT; attempt++) {
+    File* stream;
+    for (int index = 0; index < SPLASH_COUNT; index++) {
         char filePath[64];
-        snprintf(filePath, sizeof(filePath), "%ssplash%d.rix", path, splashIndex);
+        snprintf(filePath, sizeof(filePath), "%ssplash%d.rix", path, splash);
         stream = fileOpen(filePath, "rb");
         if (stream != nullptr) {
             break;
         }
 
-        splashIndex++;
-        if (splashIndex >= SPLASH_COUNT) {
-            splashIndex = 0;
+        splash++;
+
+        if (splash >= SPLASH_COUNT) {
+            splash = 0;
         }
     }
 
@@ -1501,109 +1424,105 @@ static void showSplash()
         return;
     }
 
-    // Allocate memory for the palette
     unsigned char* palette = reinterpret_cast<unsigned char*>(internal_malloc(768));
     if (palette == nullptr) {
         fileClose(stream);
         return;
     }
 
-    // Verify RIX image version (needed?)
     int version;
     fileReadInt32(stream, &version);
     if (version != 'RIX3') {
         fileClose(stream);
-        internal_free(palette);
         return;
     }
 
-    // Read image dimensions
-    short splashWidth, splashHeight;
-    fileRead(&splashWidth, sizeof(splashWidth), 1, stream);
-    fileRead(&splashHeight, sizeof(splashHeight), 1, stream);
+    short width;
+    fileRead(&width, sizeof(width), 1, stream);
 
-    // Allocate memory for the image pixel data
-    unsigned char* splashData = reinterpret_cast<unsigned char*>(internal_malloc(splashWidth * splashHeight));
-    if (splashData == nullptr) {
+    short height;
+    fileRead(&height, sizeof(height), 1, stream);
+
+    unsigned char* data = reinterpret_cast<unsigned char*>(internal_malloc(width * height));
+    if (data == nullptr) {
         internal_free(palette);
         fileClose(stream);
         return;
     }
 
-    // Load palette and image data
     paletteSetEntries(gPaletteBlack);
     fileSeek(stream, 10, SEEK_SET);
     fileRead(palette, 1, 768, stream);
-    fileRead(splashData, 1, splashWidth * splashHeight, stream);
+    fileRead(data, 1, width * height, stream);
     fileClose(stream);
 
-    int splashScreenStretchMode = 0;
-    int stretchGameMode = 0;
+    // Fix of wrong Palette, without it this makes background bright
+    // Basically just swapping first and last colors, this problem presented ONLY in F2, F1 has right palette in every splash
+    memcpy(palette + (255 * 3), palette, 3);
+    memset(palette, 0, 3);
+
+    for (int i = 0; i < width * height; i++) {
+        if (data[i] == 0) {
+            data[i] = 255;
+        } else if (data[i] == 255) {
+            data[i] = 0;
+        }
+    }
+
+    int size = 0;
+
+    // TODO: Move to settings.
     Config config;
     if (configInit(&config)) {
         if (configRead(&config, "f2_res.ini", false)) {
-            configGetInt(&config, "STATIC_SCREENS", "SPLASH_SCRN_SIZE", &splashScreenStretchMode);
-
-            if (configGetInt(&config, "STATIC_SCREENS", "STRETCH_GAME", &stretchGameMode)) {
-                splashScreenStretchMode = stretchGameMode; // always override if key exists
-            }
+            configGetInt(&config, "STATIC_SCREENS", "SPLASH_SCRN_SIZE", &size);
         }
+
         configFree(&config);
     }
 
     int screenWidth = screenGetWidth();
     int screenHeight = screenGetHeight();
 
-    // Stretch image if required or if it doesn't fit the screen
-    if (splashScreenStretchMode != 0 || screenWidth < splashWidth || screenHeight < splashHeight) {
-        int scaledWidth, scaledHeight;
+    if (size != 0 || screenWidth < width || screenHeight < height) {
+        int scaledWidth;
+        int scaledHeight;
 
-        calculateScaledSize(
-            splashWidth,
-            splashHeight,
-            screenWidth,
-            screenHeight,
-            splashScreenStretchMode,
-            scaledWidth,
-            scaledHeight);
+        if (size == 2) {
+            scaledWidth = screenWidth;
+            scaledHeight = screenHeight;
+        } else {
+            if (screenHeight * width >= screenWidth * height) {
+                scaledWidth = screenWidth;
+                scaledHeight = screenWidth * height / width;
+            } else {
+                scaledWidth = screenHeight * width / height;
+                scaledHeight = screenHeight;
+            }
+        }
 
-        unsigned char* scaled = reinterpret_cast<unsigned char*>(internal_malloc((scaledWidth) * (scaledHeight)));
+        unsigned char* scaled = reinterpret_cast<unsigned char*>(internal_malloc(scaledWidth * scaledHeight));
         if (scaled != nullptr) {
-            // Stretch the splash screen and fix edge artifacts
-            blitBufferToBufferStretchAndFixEdges(
-                splashData,
-                splashWidth,
-                splashHeight,
-                splashWidth,
-                scaled,
-                scaledWidth,
-                scaledHeight,
-                scaledWidth,
-                1 // numStates = 1 for a single splash image
-            );
-
-            int x = (screenWidth > scaledWidth) ? (screenWidth - scaledWidth) / 2 : 0;
-            int y = (screenHeight > scaledHeight) ? (screenHeight - scaledHeight) / 2 : 0;
+            blitBufferToBufferStretch(data, width, height, width, scaled, scaledWidth, scaledHeight, scaledWidth);
 
+            int x = screenWidth > scaledWidth ? (screenWidth - scaledWidth) / 2 : 0;
+            int y = screenHeight > scaledHeight ? (screenHeight - scaledHeight) / 2 : 0;
             _scr_blit(scaled, scaledWidth, scaledHeight, 0, 0, scaledWidth, scaledHeight, x, y);
             paletteFadeTo(palette);
 
             internal_free(scaled);
         }
     } else {
-        // Center image without scaling
-        int x = (screenWidth - splashWidth) / 2;
-        int y = (screenHeight - splashHeight) / 2;
-        _scr_blit(splashData, splashWidth, splashHeight, 0, 0, splashWidth, splashHeight, x, y);
+        int x = (screenWidth - width) / 2;
+        int y = (screenHeight - height) / 2;
+        _scr_blit(data, width, height, 0, 0, width, height, x, y);
         paletteFadeTo(palette);
     }
 
-    // Clean up
-    internal_free(splashData);
+    internal_free(data);
     internal_free(palette);
 
-    // Save index for next splash image
-    settings.system.splash = splashIndex + 1;
+    settings.system.splash = splash + 1;
 }
 
 int gameShowDeathDialog(const char* message)