Add "Second Dawn" to mods to compile for

Author: Bittah

.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

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

res/sd/104.cur

@@ -0,0 +1 @@
+104 CURSOR "104.cur"

res/sd/248.cur

@@ -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
+}
+

res/sd/93.ico

@@ -0,0 +1 @@
+93 ICON "93.ico"

res/sd/cursor.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
+ }
+}
+

res/sd/dialog.rch

@@ -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"