Release v4.3: README hero image

Author: d3nd3

.cursor/commands/menu-know-how.md

@@ -119,6 +119,7 @@ Notice:
 * plain words are flow text; `<text ...>` is interactive/clickable area text.
 * CAUTION: `<center>` layout treats each space separated word as a new line, then if you use double quote around your space separated text, if the length is longer than the remaining space in the frame, it will not be rendered.
 * Seems wise to try to use 2 giant blank borders either side of the content, but they must be injected with resolution dependent pixels as: ((width_of_inner_frame_px - centered_content_size_px) / 2) . Then you have a fixed size area across resolutions. CAVEAT: hr element cant be used cos has inbuilt left
+* Its possible `<stm resize ` is the best solution for fixed size frames/layouts whilst being centered across different resolutions
 
 ---
 
@@ -158,7 +159,7 @@ freshgame *Starts a fresh game, bringing up a requester asking if you wish to ex
 
 ## Control
 
-stm `<name>` `<width>` `<height>`
+stm
 * nopush *this page is not pushed onto the page stack - it cannot be revisited.*
 * waitanim *the page waits for the ghoul animation to finish before allowing any input. (E.g. on the animating main page)*
 * fragile *Any keypress will instantly exit this screen. (E.g. On the start up animation)*
@@ -294,7 +295,7 @@ text `<text>`
 * {PARSE_RECT}
 
 ctext `<cvar>` *use the text stored within the cvar, invisible hides text if text is empty*
-* atext 
+* atext *useful in <center mode to have 2 piece of text next to each other on same line, shame you cannot style them separately though*
 * invisible
 * {PARSE_RECT}
 
@@ -500,8 +501,3 @@ ifne
 ifeq
 ifset
 ifclr
-
-
----
-
-![[Pasted image 20260217062306.png]]

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v4.3
+
+- Docs: add http.png hero image to README.
+
 ## v4.2
 
 - Internal menus: RMF layout and content pass across SoF Buddy tabs (main, input, lighting, perf, scaling, social, texture, tweaks, HTTP, update help/prompt), loading header, and HTTP providers; FS_LoadFile override and internal menu hooks refined.

VERSION

@@ -1 +1 @@
-4.2
+4.3

hdr/version.h

@@ -7,4 +7,4 @@
     Increment version using: ./increment_version.sh
 */
 
-#define SOFBUDDY_VERSION "4.2"
+#define SOFBUDDY_VERSION "4.3"

rsrc/win_scripts/update_from_zip.cmd

@@ -5,12 +5,19 @@ set "SCRIPT_DIR=%~dp0"
 pushd "%SCRIPT_DIR%.." >nul 2>&1
 if errorlevel 1 (
     echo Could not locate SoF root folder.
-    pause
+    if not defined NO_PAUSE pause
     exit /b 1
 )
 set "ROOT_DIR=%CD%"
 set "UPDATE_DIR=%ROOT_DIR%\sof_buddy\update"
 set "ZIP_PATH="
+set "EXTRACT_METHOD="
+set "IS_WINE="
+set "NO_PAUSE="
+if defined SOFBUDDY_UPDATER_NO_PAUSE set "NO_PAUSE=1"
+
+:: Check for Wine environment
+reg query "HKCU\Software\Wine" >nul 2>&1 && set "IS_WINE=1"
 
 if not "%~1"=="" (
     set "ZIP_PATH=%~1"
@@ -29,15 +36,15 @@ if not defined ZIP_PATH (
     echo No update zip found in "%UPDATE_DIR%".
     echo First run: sofbuddy_update download
     popd
-    pause
+    if not defined NO_PAUSE pause
     exit /b 1
 )
 if /i not "%ZIP_PATH:~1,1%"==":" set "ZIP_PATH=%ROOT_DIR%\%ZIP_PATH%"
 for %%I in ("%ZIP_PATH%") do set "ZIP_PATH=%%~fI"
 if not exist "!ZIP_PATH!" (
     echo Update zip not found: "!ZIP_PATH!"
     popd
-    pause
+    if not defined NO_PAUSE pause
     exit /b 1
 )
 
@@ -48,67 +55,162 @@ echo Make sure Soldier of Fortune is fully closed before continuing.
 echo.
 
 call :extract_zip "!ZIP_PATH!"
-if errorlevel 1 (
-    echo.
-    echo Failed to extract update zip.
-    echo Try installing 7-Zip and rerun this script:
-    echo   https://www.7-zip.org/
-    popd
-    pause
-    exit /b 1
-)
+
+:: Verify extraction success by checking if key files exist
+if not exist "%ROOT_DIR%\sof_buddy.dll" goto :extract_failed
+if not exist "%ROOT_DIR%\sof_buddy\update_from_zip.cmd" goto :extract_failed
 
 echo.
 echo Update extraction complete.
-echo Deleting used update zip...
-del /f /q "!ZIP_PATH!" >nul 2>&1
-if exist "!ZIP_PATH!" (
-    echo Warning: could not delete "!ZIP_PATH!".
+if defined EXTRACT_METHOD echo Extraction method: !EXTRACT_METHOD!
+
+if /i "!EXTRACT_METHOD!"=="vbscript" (
+    echo Keeping update zip because VBScript extraction is not fully reliable.
+    echo If files did not update, run sof_buddy/update_from_zip.sh from Linux host.
 ) else (
-    echo Deleted: !ZIP_PATH!
+    echo Removing update zip.
+    del /f /q "!ZIP_PATH!" >nul 2>&1
+    if exist "!ZIP_PATH!" (
+        echo Warning: could not delete "!ZIP_PATH!".
+    ) else (
+        echo Removed: !ZIP_PATH!
+    )
 )
 echo.
 echo Searching for old configuration to prune...
 for /r "%ROOT_DIR%" %%F in (sofbuddy.cfg) do (
     if exist "%%F" (
-        echo   Deleting: %%F
+        echo   Removing: %%F
         del /f /q "%%F" >nul 2>&1
     )
 )
 echo.
 echo You can now launch SoF normally.
 popd
-pause
+if not defined NO_PAUSE pause
 exit /b 0
 
+:extract_failed
+echo.
+echo [ERROR] Failed to extract update zip.
+echo.
+if defined IS_WINE (
+    echo Wine detected. Since automated unzipping failed:
+    call :print_linux_manual_command "!ZIP_PATH!"
+) else (
+    echo Try installing 7-Zip and rerun this script:
+    echo   https://www.7-zip.org/
+)
+popd
+if not defined NO_PAUSE pause
+exit /b 1
+
 :extract_zip
 set "ZIP=%~1"
 
-where tar.exe >nul 2>&1
-if not errorlevel 1 (
-    tar.exe -xf "%ZIP%" -C "%ROOT_DIR%" >nul 2>&1
-    if not errorlevel 1 exit /b 0
+:: 1. Try Windows 10/Wine built-in tar.exe
+:: Skipped on Wine because it often fails silently
+if not defined IS_WINE (
+    where tar.exe >nul 2>&1
+    if not errorlevel 1 (
+        tar.exe -xf "%ZIP%" -C "%ROOT_DIR%" >nul 2>&1
+        if not errorlevel 1 (
+            set "EXTRACT_METHOD=tar"
+            exit /b 0
+        )
+    )
 )
 
+:: 2. Try 7-Zip if installed
 where 7z.exe >nul 2>&1
 if not errorlevel 1 (
     7z.exe x -y "%ZIP%" -o"%ROOT_DIR%" >nul 2>&1
-    if not errorlevel 1 exit /b 0
+    if not errorlevel 1 (
+        set "EXTRACT_METHOD=7z"
+        exit /b 0
+    )
 )
 
-call :extract_with_vbscript "%ZIP%"
-if not errorlevel 1 exit /b 0
+:: 3. Try Linux Host Unzip (Wine Only)
+if defined IS_WINE (
+    call :extract_with_unix_unzip "%ZIP%"
+    :: We assume success here because the function ignores error codes
+    :: and falls through to file validation in the main loop.
+    set "EXTRACT_METHOD=unix-unzip"
+    exit /b 0
+)
 
-where powershell.exe >nul 2>&1
-if not errorlevel 1 (
-    powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "try { Expand-Archive -LiteralPath '%ZIP%' -DestinationPath '%ROOT_DIR%' -Force; exit 0 } catch { exit 1 }" >nul 2>&1
-    if not errorlevel 1 exit /b 0
+:: 4. Try VBScript (Windows Only)
+if not defined IS_WINE (
+    call :extract_with_vbscript "%ZIP%"
+    if not errorlevel 1 (
+        set "EXTRACT_METHOD=vbscript"
+        exit /b 0
+    )
+)
+
+:: 5. Try PowerShell (Windows Only)
+if not defined IS_WINE (
+    where powershell.exe >nul 2>&1
+    if not errorlevel 1 (
+        powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "try { Expand-Archive -LiteralPath '%ZIP%' -DestinationPath '%ROOT_DIR%' -Force; exit 0 } catch { exit 1 }" >nul 2>&1
+        if not errorlevel 1 (
+            set "EXTRACT_METHOD=powershell"
+            exit /b 0
+        )
+    )
 )
 
 exit /b 1
 
+:print_linux_manual_command
+set "ZIP=%~1"
+set "HOST_SH="
+set "HOST_ZIP="
+for /f "delims=" %%I in ('winepath.exe -u "%ROOT_DIR%\sof_buddy\update_from_zip.sh" 2^>nul') do set "HOST_SH=%%I"
+for /f "delims=" %%I in ('winepath.exe -u "%ZIP%" 2^>nul') do set "HOST_ZIP=%%I"
+if defined HOST_SH if defined HOST_ZIP (
+    echo.
+    echo Run this command in your Linux terminal:
+    echo   /bin/bash "%HOST_SH%" "%HOST_ZIP%"
+    echo.
+)
+exit /b 0
+
+:extract_with_unix_unzip
+set "ZIP_WIN=%~1"
+set "UNZIP_BIN="
+
+:: Locate unzip via winepath
+for /f "delims=" %%I in ('winepath -w /usr/bin/unzip 2^>nul') do set "UNZIP_BIN=%%I"
+if not defined UNZIP_BIN for /f "delims=" %%I in ('winepath -w /bin/unzip 2^>nul') do set "UNZIP_BIN=%%I"
+
+:: Fallback
+if not defined UNZIP_BIN if exist "Z:\usr\bin\unzip" set "UNZIP_BIN=Z:\usr\bin\unzip"
+if not defined UNZIP_BIN if exist "Z:\bin\unzip" set "UNZIP_BIN=Z:\bin\unzip"
+
+if not defined UNZIP_BIN exit /b 1
+
+set "UNIX_ZIP="
+set "UNIX_DEST="
+
+for /f "delims=" %%I in ('winepath -u "%ZIP_WIN%"') do set "UNIX_ZIP=%%I"
+for /f "delims=" %%I in ('winepath -u "%ROOT_DIR%"') do set "UNIX_DEST=%%I"
+
+if not defined UNIX_ZIP exit /b 1
+if not defined UNIX_DEST exit /b 1
+
+:: Execute using start /b /wait.
+:: This runs successfully but might return ErrorLevel 1 due to permission warnings.
+start /b /wait "" "%UNZIP_BIN%" -o "%UNIX_ZIP%" -d "%UNIX_DEST%" >nul 2>&1
+
+:: We intentionally return success (0) here. 
+:: The main script will verify if files actually exist.
+exit /b 0
+
 :extract_with_vbscript
 set "ZIP=%~1"
+if defined IS_WINE exit /b 1
 set "VBS_DIR=%TEMP%"
 if not defined VBS_DIR set "VBS_DIR=%UPDATE_DIR%"
 if not exist "%VBS_DIR%" set "VBS_DIR=%UPDATE_DIR%"
@@ -133,9 +235,9 @@ if errorlevel 1 (
     del /f /q "%VBS%" >nul 2>&1
     exit /b 1
 )
-cscript.exe //nologo "%VBS%" "%ZIP%" "%ROOT_DIR%" >nul
+cscript.exe //nologo "%VBS%" "%ZIP%" "%ROOT_DIR%" >nul 2>&1
 set "RC=%ERRORLEVEL%"
 del /f /q "%VBS%" >nul 2>&1
 
 if "%RC%"=="0" exit /b 0
-exit /b 1
+exit /b 1

src/core/update_command.cpp

@@ -34,7 +34,8 @@ constexpr const char* kUpdateApiUrl = kUpdateApiUrlGitHub;
 constexpr const char* kUpdateReleasesUrl = kUpdateReleasesUrlGitHub;
 #endif
 constexpr const char* kUpdateOutputDir = "sof_buddy/update";
-constexpr const char* kUpdateInstallScript = "sof_buddy\\update_from_zip.cmd";
+constexpr const char* kUpdateInstallScriptWindows = "sof_buddy\\update_from_zip.cmd";
+constexpr const char* kUpdateInstallScriptWine = "sof_buddy/update_from_zip.cmd";
 constexpr DWORD kUpdateTimeoutMs = 8000;
 constexpr uintptr_t kWinstartRva = 0x0040353C;
 
@@ -1056,7 +1057,7 @@ void Cmd_SoFBuddy_Update_f(void) {
 void Cmd_SoFBuddy_UpdateInstall_f(void) {
     if (!orig_Cmd_ExecuteString) return;
     const bool wine = is_running_under_wine();
-    const char* script = kUpdateInstallScript;
+    const char* script = wine ? kUpdateInstallScriptWine : kUpdateInstallScriptWindows;
     if (!is_regular_file(script)) {
         set_update_status("install script missing");
         PrintOut(PRINT_BAD, "sofbuddy_update_install: missing %s\n", script);

src/features/internal_menus/menu_library/sof_buddy/sb_update_prompt.rmf

@@ -1,6 +1,6 @@
-<stm resize 460 300>
+<stm resize 550 300>
 <include tints>
 
-<frame main 460 300 border 40 1 gray backfill black>
+<frame main 0 0 border 40 1 gray backfill black>
 <frame alert 0 0 page sof_buddy/sb_update_prompt_content cut main>
 </stm>

src/features/internal_menus/menu_library/sof_buddy/sb_update_prompt_content.rmf

@@ -24,9 +24,9 @@ Download latest release zip now?<hbr>
 <hbr>
 
 <font type title tint normaltext atint red>
-<normal>
+<left>
 <text "Not now" border 16 1 gray key mouse1 "killmenu">
-<blank 180 1>
+<right>
 <font type title tint normaltext atint green>
 <text "Download+Install" border 16 1 gray key mouse1 "killmenu;sofbuddy_update download;sofbuddy_update_install">
 </stm>