Add "Second Dawn" to mods to compile for

Bittah · Bittah · commit f43116c934bc · 2025-11-24T06:13:23.000+01:00
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -28,8 +28,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        type: [ TSCLIENT, MOD_DTA, MOD_TI, MOD_TO, MOD_RUBICON, MOD_FD ]
-        #type: [ SINGLEPLAYER, TIBSUN, TSCLIENT, MOD_DTA, MOD_TI, MOD_TO, MOD_RUBICON, MOD_FD, MOD_TM ]
+        type: [ TSCLIENT, MOD_DTA, MOD_TI, MOD_TO, MOD_RUBICON, MOD_FD, MOD_SD ]
+        #type: [ SINGLEPLAYER, TIBSUN, TSCLIENT, MOD_DTA, MOD_TI, MOD_TO, MOD_RUBICON, MOD_FD, MOD_TM, MOD_SD ]
       
     steps:
     - name: Clone Repository
diff --git a/Makefile b/Makefile
@@ -105,6 +105,12 @@ NFLAGS += -DMOD_TM
 CFLAGS += -DMOD_TM
 endif
 
+ifdef MOD_SD
+$(info MOD_SD defined)
+NFLAGS += -DMOD_SD
+CFLAGS += -DMOD_SD
+endif
+
 ifdef VINIFERA
 $(info VINIFERA defined)
 NFLAGS += -DVINIFERA
@@ -263,8 +269,8 @@ OBJS += src/saved_games_in_subdir.o
 OBJS += src/savegame.o
 OBJS += src/scrap_metal_explosion.o
 
-# Only include in: MOD_TO MOD_RUBICON MOD_FD MOD_TM TSCLIENT
-ifneq ($(call ifdef_any_of,MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_TM TSCLIENT),)
+# Only include in: MOD_TO MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT
+ifneq ($(call ifdef_any_of,MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT),)
 OBJS += src/shared_control.o
 endif
 
@@ -286,8 +292,8 @@ OBJS += src/waypoint_enhancements.o
 OBJS += src/wcsncpy.o
 OBJS += src/basic_theme_fix.o
 
-# Only include in: MOD_DTA MOD_FD
-ifneq ($(call ifdef_any_of,MOD_DTA MOD_FD),)
+# Only include in: MOD_DTA MOD_FD MOD_SD
+ifneq ($(call ifdef_any_of,MOD_DTA MOD_FD MOD_SD),)
 OBJS += src/vehicle_transports.o
 endif
 
@@ -348,8 +354,8 @@ OBJS += src/max_pip_counts.o
 OBJS += src/mechanics.o
 OBJS += src/ionstorm_jumpjet_crash.o
 
-# Only include in: MOD_TO MOD_RUBICON MOD_FD MOD_TM TSCLIENT
-ifneq ($(call ifdef_any_of,MOD_TO MOD_RUBICON MOD_FD MOD_TM TSCLIENT),)
+# Only include in: MOD_TO MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT
+ifneq ($(call ifdef_any_of,MOD_TO MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT),)
 OBJS += src/move_team_group_number.o
 endif
 
@@ -373,7 +379,7 @@ OBJS += src/chat_ignore.o
 OBJS += src/chatallies.o
 
 # The logger is needed for certain client features
-ifneq ($(call ifdef_any_of,MOD_DTA MOD_TI MOD_TO MOD_RUBICON MOD_FD MOD_TM TSCLIENT),)
+ifneq ($(call ifdef_any_of,MOD_DTA MOD_TI MOD_TO MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT),)
 OBJS += src/logger.o
 endif
 
@@ -382,8 +388,8 @@ ifneq ($(call ifdef_any_of,MOD_DTA MOD_TO),)
 OBJS += src/remove_iscoredefender_emp_immunity.o
 endif
 
-# Only include in: MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_TM TSCLIENT
-ifneq ($(call ifdef_any_of,MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_TM TSCLIENT),)
+# Only include in: MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT
+ifneq ($(call ifdef_any_of,MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT),)
 OBJS += src/tiberium_stuff.o
 endif
 
@@ -544,6 +550,9 @@ endif
 ifdef MOD_TM
     OBJS += src/tm_hacks.o
 endif
+ifdef MOD_SD
+    OBJS += src/sd_hacks.o
+endif
 
 
 # =========================================================
@@ -576,6 +585,9 @@ endif
 ifdef MOD_TM
     OBJS += res/tm/res.o
 endif
+ifdef MOD_SD
+    OBJS += res/sd/res.o
+endif
 
 
 # =========================================================
@@ -647,3 +659,8 @@ ifdef MOD_TM
 res/to/res.o: res/tm/res.rc
 	$(WINDRES) $(WINDRES_FLAGS) -Ires/tm/ $< $@
 endif
+
+ifdef MOD_SD
+res/to/res.o: res/sd/res.rc
+	$(WINDRES) $(WINDRES_FLAGS) -Ires/sd/ $< $@
+endif
diff --git a/build_sd.cmd b/build_sd.cmd
@@ -0,0 +1,39 @@
+@echo off
+REM
+REM cnc-patch environment config
+REM
+set PATH=C:\win-builds-patch-32\bin
+
+set /P c=Generate Release executable [Y/N]?
+if /I "%c%" EQU "N" goto :debug
+
+if not exist "build\release" mkdir build\release
+
+gmake clean
+gmake MOD_SD=1
+move /Y game.exe ./build/release/game.exe
+
+:debug
+set /P c=Generate Debug executable [Y/N]?
+if /I "%c%" EQU "N" goto :vinifera
+
+if not exist "build\debug" mkdir build\debug
+
+gmake clean
+gmake MOD_SD=1 WWDEBUG=1
+move /Y game.exe ./build/debug/game.exe
+
+:vinifera
+set /P c=Generate Vinifera executable [Y/N]?
+if /I "%c%" EQU "N" goto :exit
+
+if not exist "build\vinifera" mkdir build\vinifera
+
+gmake clean
+gmake MOD_SD=1 VINIFERA=1
+move /Y game.exe ./build/vinifera/game.exe
+
+pause
+
+:exit
+exit
diff --git a/res/sd/104.cur b/res/sd/104.cur
diff --git a/res/sd/248.cur b/res/sd/248.cur
diff --git a/res/sd/93.ico b/res/sd/93.ico
diff --git a/res/sd/cursor.rch b/res/sd/cursor.rch
@@ -0,0 +1 @@
+104 CURSOR "104.cur"
diff --git a/res/sd/dialog.rch b/res/sd/dialog.rch
@@ -0,0 +1,21 @@
+198 DIALOGEX 0, 0, 200, 100, 0
+STYLE DS_SETFONT | WS_POPUP
+EXSTYLE WS_EX_TRANSPARENT
+FONT 8, "MS Sans Serif"
+{
+ LTEXT "This is a dialog of known size that is used to resize other dialogs.", -1, 17, 23, 154, 23, WS_DISABLED, WS_EX_TRANSPARENT
+ LTEXT "Please don't change the size, and leave it as a popup, not a child!!!!", -1, 14, 60, 157, 25, WS_DISABLED, WS_EX_TRANSPARENT
+}
+
+247 DIALOG 0, 0, 252, 82
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "Tiberian Sun"
+FONT 8, "MS Sans Serif"
+{
+ CTEXT "Tiberian Sun has encountered an internal error", -1, 7, 11, 238, 8, NOT WS_GROUP
+ CTEXT "and is unable to continue normally.", 1151, 7, 19, 238, 8, NOT WS_GROUP
+ CTEXT "Please visit our website at http://www.westwood.com", 1152, 7, 36, 238, 8, NOT WS_GROUP
+ PUSHBUTTON "OK", 1153, 83, 61, 79, 14
+ CTEXT "for the latest updates and technical support.", -1, 7, 44, 238, 8, NOT WS_GROUP
+}
+
diff --git a/res/sd/icon.rch b/res/sd/icon.rch
@@ -0,0 +1 @@
+93 ICON "93.ico"
diff --git a/res/sd/menu.rch b/res/sd/menu.rch
@@ -0,0 +1,13 @@
+160 MENU
+{
+ POPUP "&Mode"
+ {
+  MENUITEM "640 x 400", -25227, CHECKED
+  MENUITEM "640 x 480", -25232
+  MENUITEM "800 x 600", -25231
+  MENUITEM "1024 x 768", -25230
+  MENUITEM "1280 x 1024", -25229
+  MENUITEM SEPARATOR
+ }
+}
+
diff --git a/res/sd/res.rc b/res/sd/res.rc
@@ -0,0 +1,17 @@
+#include <windows.h>
+
+#include "dialog.rch"
+#include "menu.rch"
+#include "icon.rch"
+#include "cursor.rch"
+
+#define SUBTITLE     Tiberian Sun
+#define HARD_VERSION 1,0,0,1
+#define SOFT_VERSION 2.03
+#define YEAR         2000
+#define ABBREVIATION TS
+
+#include "version.rch"
+
+//LANGUAGE 9, SUBLANG_SYS_DEFAULT
+//1 24 "tibsun.exe.manifest"
diff --git a/res/sd/tibsun.exe.manifest b/res/sd/tibsun.exe.manifest
@@ -0,0 +1,14 @@
+﻿<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity type="win32" name="tibsun.exe" version="1.0.0.0" />
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="BLOWFISH" version="1.0.0.0" />
+    </dependentAssembly>
+  </dependency>
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>true</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
diff --git a/res/sd/version.rch b/res/sd/version.rch
@@ -0,0 +1,35 @@
+#define xstr(s)    str(s)
+#define str(s)    #s
+
+#define TITLE     Command & Conquer : SUBTITLE
+
+1 VERSIONINFO
+FILEVERSION HARD_VERSION
+PRODUCTVERSION HARD_VERSION
+FILEOS 0x4
+FILETYPE 0x1
+{
+ BLOCK "StringFileInfo"
+ {
+  BLOCK "040904B0"
+  {
+   VALUE "Comments",         ""
+   VALUE "CompanyName",      "Westwood Studios"
+   VALUE "FileDescription",  "Second Dawn (Game Executable)"
+   VALUE "FileVersion",      xstr(VERSION)
+   VALUE "InternalName",     xstr(ABBREVIATION)
+   VALUE "LegalCopyright",   xstr(Copyright � YEAR Westwood Studios)
+   VALUE "LegalTrademarks",  "Command & Conquer is a trademark of Westwood Studios"
+   VALUE "OriginalFilename", "Sun.exe"
+   VALUE "PrivateBuild",     ""
+   VALUE "ProductName",      xstr(TITLE)
+   VALUE "ProductVersion",   xstr(VERSION)
+   VALUE "SpecialBuild",     ""
+  }
+ }
+
+ BLOCK "VarFileInfo"
+ {
+  VALUE "Translation", 0x0409, 0x04B0
+ }
+}
diff --git a/src/config.c b/src/config.c
@@ -28,6 +28,10 @@ bool RefundFreeUnit = false;
 int32_t MultiFactoryCost = 2000;
 bool RefundFreeUnit = false;
 
+#elif defined(MOD_SD)
+int32_t MultiFactoryCost = 2000;
+bool RefundFreeUnit = false;
+
 #elif defined(TSCLIENT)
 int32_t MultiFactoryCost = 2000;
 bool RefundFreeUnit = false;
diff --git a/src/logger.asm b/src/logger.asm
@@ -51,6 +51,10 @@ sstring str_DebugLog, "FD.LOG"
 sstring str_DebugLog, "TM.LOG"
 %endif
 
+%ifdef MOD_SD
+sstring str_DebugLog, "SD.LOG"
+%endif
+
 sstring str_a, "a"
 
 sstring str_OK, "OK?\n"
diff --git a/src/sd_hacks.asm b/src/sd_hacks.asm
@@ -0,0 +1,94 @@
+%include "macros/patch.inc"
+%include "macros/datatypes.inc"
+%include "TiberianSun.inc"
+
+
+; "Overlay tiberium fix thing, 4th etc"
+@SET 0x00644DF9, {mov dword [esi+0ACh], 0Ch}
+
+; Art.ini key, WalkFrames= default value
+@SET 0x0065B9E6, {mov byte [esi+4D0h], 1} ;byte ptr
+@SET 0x0065BF3D, {mov [esi+21h], eax}
+
+; Building selection box color change when affected by limpet from palette index yellow (5) to
+; orange (6). Used with unit selection box (select.shp) color change for limpet affected frame.
+@SET 0x0062B2E4, {mov dword [esp+1Ch], 0x06}
+@SET 0x0062C0C1, {mov edi, 0x06}
+
+;
+; The following Sidebar Hack-related patches are included in Vinifera compatible builds until the spawner is reimplemented.
+;
+
+; Set global variable byte containing side ID to load files for
+@SET 0x004E2CFA, {mov byte [0x7E2500], al}
+@SET 0x004E2CFF, nop
+@SET 0x004E2D00, {add esp, 4}
+@SJMP 0x004E2D03, 0x004E2D13 ; jmp short
+@SET 0x004E2D05, nop
+
+; Load sidebar MIX files for new sides properly
+@SET 0x005DD798, {mov cl, byte [0x007E2500]}
+@CLEAR 0x005DD79E, 0x90, 0x005DD7A2
+
+; Load speech MIX files for new sides properly
+; Defaults SpeechSide to our hijacked player side value
+hack 0x005DD6FB
+    mov  eax, [Scen]
+    xor  ecx, ecx
+    mov  cl, byte [0x007E2500] ; PlayerSide (was Session.IsGDI)
+    mov  [eax+0x1E44], ecx ; set SpeechSide
+    jmp  0x005DD784        ; go back to game code for initializing side
+
+;
+; The following patches will not be included in Vinifera compatible builds.
+;
+%ifndef VINIFERA
+
+sstring str_TSCLong, "Second Dawn"
+sstring str_LanguageDLLNotFound, "Language.dll not found, please start TiberianSun.exe and click Save in the Options menu."
+
+; String references
+@SET 0x00472567, push str_TSCLong
+@SET 0x0047256C, push str_LanguageDLLNotFound
+@SET 0x005FF2C0, {cmp edx, str_TSCLong}
+@SET 0x005FF2C8, push str_TSCLong
+@SET 0x005FF2D9, push str_TSCLong
+@SET 0x005FF3AA, {cmp ecx, str_TSCLong}
+@SET 0x005FF3B2, push str_TSCLong
+@SET 0x005FF3C3, push str_TSCLong
+@SET 0x005FF4EC, push str_TSCLong
+@SET 0x006861ED, {mov dword [esp+48h], str_TSCLong}
+@SET 0x00686215, push str_TSCLong
+@SET 0x0068621A, push str_TSCLong
+@SET 0x006862BD, push str_TSCLong
+@SET 0x006862C2, push str_TSCLong
+
+; Remove framework mode mmt/mms loading
+@LJMP 0x004F5182, 0x004F528C    ; jmp loc_4F528C
+
+;; IsScoreShuffle on by default
+@SET 0x005899F1, {mov byte [eax+35h], 1} ;byte ptr
+@SET 0x005899F5, nop
+@SET 0x005899F6, nop
+@SET 0x005899F7, nop
+
+; Load sidebar MIX files for new sides properly (for saved games)
+@SET 0x005D6C4F, {mov cl, [eax+1D91h]}
+@CLEAR 0x005D6C55, 0x90, 0x005D6C58
+
+; Erase NAWALL and GAWALL hardcoding
+@SET 0x00710DA4, {db 0,0,0,0,0,0}
+@SET 0x00710DAC, {db 0,0,0,0,0,0}
+
+; Erase GAFSDF, HMEC, 155mm and ARTYHE hardcoding
+@SET 0x00710DB4, {db 0,0,0,0,0,0}
+@SET 0x00706A8C, {db 0,0,0,0}
+@SET 0x00715E78, {db 0,0,0,0,0}
+@SET 0x00714C70, {db 0,0,0,0,0,0}
+
+; Load speech MIX files for new sides properly (for saved games)
+@SET 0x005D6DCE, {xor ecx, ecx}
+@SET 0x005D6DD0, {mov cl, [eax+1D91h]}
+@CLEAR 0x005D6DD6, 0x90, 0x005D6DDB
+
+%endif
