[GEN] Backport command line arguments from Zero Hour (TheSuperHackers#744)

Author: Bart Roossien | SkyAero

Generals/Code/GameEngine/Include/Common/CommandLine.h

@@ -1,5 +1,5 @@
 /*
-**	Command & Conquer Generals(tm)
+**	Command & Conquer Generals Zero Hour(tm)
 **	Copyright 2025 Electronic Arts Inc.
 **
 **	This program is free software: you can redistribute it and/or modify

Generals/Code/GameEngine/Include/Common/GlobalData.h

@@ -326,6 +326,7 @@ class GlobalData : public SubsystemInterface
 	AsciiString m_shellMapName;				///< Holds the shell map name
 	Bool m_shellMapOn;								///< User can set the shell map not to load
 	Bool m_playIntro;									///< Flag to say if we're to play the intro or not
+	Bool m_playSizzle;								///< Flag to say whether we play the sizzle movie after the logo movie.
 	Bool m_afterIntro;								///< we need to tell the game our intro is done
 	Bool m_allowExitOutOfMovies;			///< flag to allow exit out of movies only after the Intro has played
 
@@ -480,6 +481,7 @@ class GlobalData : public SubsystemInterface
 	Int m_latencyPeriod;					///< Period of sinusoidal modulation of latency
 	Int m_latencyNoise;						///< Max amplitude of jitter to throw in
 	Int m_packetLoss;							///< Percent of packets to drop
+	Bool m_extraLogging;					///< More expensive debug logging to catch crashes.
 #endif
 
 #ifdef DEBUG_CRASHING

Generals/Code/GameEngine/Source/Common/CommandLine.cpp

@@ -1,5 +1,5 @@
 /*
-**	Command & Conquer Generals(tm)
+**	Command & Conquer Generals Zero Hour(tm)
 **	Copyright 2025 Electronic Arts Inc.
 **
 **	This program is free software: you can redistribute it and/or modify
@@ -34,6 +34,14 @@
 #include "GameClient/GameText.h"
 #include "GameNetwork/NetworkDefs.h"
 
+#ifdef _INTERNAL
+// for occasional debugging...
+//#pragma optimize("", off)
+//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
+#endif
+
+
+
 Bool TheDebugIgnoreSyncErrors = FALSE;
 extern Int DX8Wrapper_PreserveFPU;
 
@@ -644,7 +652,18 @@ Int parseBuildMapCache(char *args[], int)
 	return 1;
 }
 
-#if defined(_DEBUG) || defined(_INTERNAL)
+
+#if defined(_DEBUG) || defined(_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+Int parsePreload( char *args[], int num )
+{
+	if( TheWritableGlobalData )
+		TheWritableGlobalData->m_preloadAssets = TRUE;
+	return 1;
+}
+#endif
+
+
+#if defined(_DEBUG) || defined(_INTERNAL) 
 Int parseDisplayDebug(char *args[], int)
 {
 	if (TheWritableGlobalData)
@@ -664,12 +683,6 @@ Int parseFile(char *args[], int num)
 	return 2;
 }
 
-Int parsePreload( char *args[], int num )
-{
-	if( TheWritableGlobalData )
-		TheWritableGlobalData->m_preloadAssets = TRUE;
-	return 1;
-}
 
 Int parsePreloadEverything( char *args[], int num )
 {
@@ -777,18 +790,37 @@ Int parseNoShellMap(char *args[], int)
 	return 1;
 }
 
+Int parseNoShaders(char *args[], int)
+{
+	if (TheWritableGlobalData)
+	{
+		TheWritableGlobalData->m_chipSetType = 1;	//force to a voodoo card which uses least amount of features.
+	}
+	return 1;
+}
+
 #if (defined(_DEBUG) || defined(_INTERNAL))
 Int parseNoLogo(char *args[], int)
 {
 	if (TheWritableGlobalData)
 	{
 		TheWritableGlobalData->m_playIntro = FALSE;
 		TheWritableGlobalData->m_afterIntro = TRUE;
+		TheWritableGlobalData->m_playSizzle = FALSE;
 	}
 	return 1;
 }
 #endif
 
+Int parseNoSizzle( char *args[], int )
+{
+	if (TheWritableGlobalData)
+	{
+		TheWritableGlobalData->m_playSizzle = FALSE;
+	}
+	return 1;
+}
+
 Int parseShellMap(char *args[], int num)
 {
 	if (TheWritableGlobalData && num > 1)
@@ -820,6 +852,10 @@ Int parseQuickStart( char *args[], int num )
 {
 #if (defined(_DEBUG) || defined(_INTERNAL))
   parseNoLogo( args, num );
+#else
+	//Kris: Patch 1.01 -- Allow release builds to skip the sizzle video, but still force the EA logo to show up.
+	//This is for legal reasons.
+	parseNoSizzle( args, num );
 #endif
 	parseNoShellMap( args, num );
 	parseNoWindowAnimation( args, num );
@@ -835,6 +871,29 @@ Int parseConstantDebug( char *args[], int num )
 	return 1;
 }
 
+#if (defined(_DEBUG) || defined(_INTERNAL))
+Int parseExtraLogging( char *args[], int num )
+{
+	if (TheWritableGlobalData)
+	{
+		TheWritableGlobalData->m_extraLogging = TRUE;
+	}
+	return 1;
+}
+#endif
+
+//-allAdvice feature
+/*
+Int parseAllAdvice( char *args[], int num )
+{
+	if( TheWritableGlobalData )
+	{
+		TheWritableGlobalData->m_allAdvice = TRUE;
+	}
+	return 1;
+}
+*/
+
 Int parseShowTeamDot( char *args[], int num )
 {
 	if( TheWritableGlobalData )
@@ -973,6 +1032,20 @@ Int parseBenchmark(char *args[], int num)
 }
 #endif
 
+#if defined(_DEBUG) || defined(_INTERNAL)
+#ifdef DUMP_PERF_STATS
+Int parseStats(char *args[], int num)
+{
+	if (TheWritableGlobalData && num > 1)
+	{
+		TheWritableGlobalData->m_dumpStatsAtInterval = TRUE;
+		TheWritableGlobalData->m_statsInterval  = atoi(args[1]);
+	}
+	return 2;
+}
+#endif
+#endif
+
 #ifdef DEBUG_CRASHING
 Int parseIgnoreAsserts(char *args[], int num)
 {
@@ -1056,14 +1129,14 @@ Int parseMod(char *args[], Int num)
 		}
 
 		// now check for dir-ness
-		struct stat statBuf;
-		if (stat(modPath.str(), &statBuf) != 0)
+		struct _stat statBuf;
+		if (_stat(modPath.str(), &statBuf) != 0)
 		{
 			DEBUG_LOG(("Could not _stat() mod.\n"));
 			return 2; // could not stat the file/dir.
 		}
 
-		if (statBuf.st_mode & S_IFDIR)
+		if (statBuf.st_mode & _S_IFDIR)
 		{
 			if (!modPath.endsWith("\\") && !modPath.endsWith("/"))
 				modPath.concat('\\');
@@ -1129,6 +1202,9 @@ static CommandLineParam params[] =
 	{ "-scriptDebug", parseScriptDebug },
 	{ "-playStats", parsePlayStats },
 	{ "-mod", parseMod },
+	{ "-noshaders", parseNoShaders },
+	{ "-quickstart", parseQuickStart },
+
 #if (defined(_DEBUG) || defined(_INTERNAL))
 	{ "-noaudio", parseNoAudio },
 	{ "-map", parseMapName },
@@ -1137,7 +1213,10 @@ static CommandLineParam params[] =
 	{ "-noLogOrCrash", parseNoLogOrCrash },
 	{ "-FPUPreserve", parseFPUPreserve },
 	{ "-benchmark", parseBenchmark },
-	{ "-saveStats", parseSaveStats },
+#ifdef DUMP_PERF_STATS
+	{ "-stats", parseStats }, 
+#endif
+  { "-saveStats", parseSaveStats },
 	{ "-localMOTD", parseLocalMOTD },
 	{ "-UseCSF", parseUseCSF },
 	{ "-NoInputDisable", parseNoInputDisable },
@@ -1218,8 +1297,10 @@ static CommandLineParam params[] =
 	{ "-munkee", parseMunkee },
 	{ "-displayDebug", parseDisplayDebug },
 	{ "-file", parseFile },
-	{ "-preload", parsePreload },
-	{ "-preloadEverything", parsePreloadEverything },
+  
+//	{ "-preload", parsePreload },
+	
+  { "-preloadEverything", parsePreloadEverything },
 	{ "-logAssets", parseLogAssets },
 	{ "-netMinPlayers", parseNetMinPlayers },
 	{ "-DemoLoadScreen", parseDemoLoadScreen },
@@ -1239,14 +1320,15 @@ static CommandLineParam params[] =
 	{ "-noShellAnim", parseNoWindowAnimation },
 	{ "-winCursors", parseWinCursors },
 	{ "-constantDebug", parseConstantDebug },
-	{ "-quickstart", parseQuickStart },
 	{ "-seed", parseSeed },
 	{ "-noagpfix", parseIncrAGPBuf },
 	{ "-noFPSLimit", parseNoFPSLimit },
 	{ "-dumpAssetUsage", parseDumpAssetUsage },
 	{ "-jumpToFrame", parseJumpToFrame },
 	{ "-updateImages", parseUpdateImages },
 	{ "-showTeamDot", parseShowTeamDot },
+	{ "-extraLogging", parseExtraLogging },
+
 #endif
 
 #ifdef DEBUG_LOGGING
@@ -1261,6 +1343,15 @@ static CommandLineParam params[] =
 #ifdef DEBUG_STACKTRACE
 	{ "-ignoreStackTrace", parseIgnoreStackTrace },
 #endif
+
+	//-allAdvice feature
+	//{ "-allAdvice", parseAllAdvice },
+
+#if defined(_DEBUG) || defined(_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+  { "-preload", parsePreload },
+#endif
+
+
 };
 
 // parseCommandLine ===========================================================

Generals/Code/GameEngine/Source/Common/GlobalData.cpp

@@ -518,6 +518,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "UseLocalMOTD",								INI::parseBool,				NULL,			offsetof( GlobalData, m_useLocalMOTD ) },
 	{ "BaseStatsDir",								INI::parseAsciiString,NULL,			offsetof( GlobalData, m_baseStatsDir ) },
 	{ "LocalMOTDPath",							INI::parseAsciiString,NULL,			offsetof( GlobalData, m_MOTDPath ) },
+	{ "ExtraLogging",								INI::parseBool,				NULL,			offsetof(GlobalData, m_extraLogging) },
 #endif
 
 	{ NULL,					NULL,						NULL,						0 }  // keep this last
@@ -581,6 +582,7 @@ GlobalData::GlobalData()
 	m_useLocalMOTD = FALSE;
 	m_baseStatsDir = ".\\";
 	m_MOTDPath = "MOTD.txt";
+	m_extraLogging = FALSE;
 #endif
 
 #ifdef DEBUG_CRASHING
@@ -957,6 +959,7 @@ GlobalData::GlobalData()
 	m_shellMapName.set("Maps\\ShellMap1\\ShellMap1.map");
 	m_shellMapOn =TRUE;
 	m_playIntro = TRUE;
+	m_playSizzle = TRUE;
 	m_afterIntro = FALSE;
 	m_allowExitOutOfMovies = FALSE;
 	m_loadScreenRender = FALSE;

Generals/Code/GameEngine/Source/GameClient/GameClient.cpp

@@ -514,7 +514,7 @@ void GameClient::update( void )
 	//Initial Game Codition.  We must show the movie first and then we can display the shell	
 	if(TheGlobalData->m_afterIntro && !TheDisplay->isMoviePlaying())
 	{
-		if( playSizzle)
+		if( playSizzle && TheGlobalData->m_playSizzle)
 		{
 			TheWritableGlobalData->m_allowExitOutOfMovies = TRUE;
 			if(TheGameLODManager && TheGameLODManager->didMemPass())

Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp

@@ -852,6 +852,14 @@ AsciiString AIStateMachine::getCurrentStateName(void) const
  */
 StateReturnType AIStateMachine::updateStateMachine()
 {
+	//-extraLogging
+	#if (defined(_DEBUG) || defined(_INTERNAL))
+	Bool idle = getOwner()->getAI()->isIdle();
+	if (!idle && TheGlobalData->m_extraLogging)
+		DEBUG_LOG(("%d - %s::update() start - %s", TheGameLogic->getFrame(), getCurrentStateName().str(), getOwner()->getTemplate()->getName().str()));
+	#endif
+	//end -extraLogging 
+
 	if (m_temporaryState)
 	{
 		// execute this state
@@ -862,13 +870,48 @@ StateReturnType AIStateMachine::updateStateMachine()
 				status = STATE_SUCCESS;
 			}
 		}
-		if (status==STATE_CONTINUE)	{
+		if (status==STATE_CONTINUE)	
+		{
+			//-extraLogging
+			#if (defined(_DEBUG) || defined(_INTERNAL))
+				if (!idle && TheGlobalData->m_extraLogging)
+					DEBUG_LOG((" - RETURN EARLY STATE_CONTINUE\n"));
+			#endif
+			//end -extraLogging 
 			return status;
 		}
 		m_temporaryState->onExit(EXIT_NORMAL);
 		m_temporaryState = NULL;
 	}
-	return StateMachine::updateStateMachine();
+	StateReturnType retType = StateMachine::updateStateMachine();
+
+	//-extraLogging 
+	#if (defined(_DEBUG) || defined(_INTERNAL))
+		AsciiString result;
+		if (TheGlobalData->m_extraLogging)
+		{
+			switch (retType)
+			{
+			case STATE_CONTINUE:
+				result.format("CONTINUE");
+				break;
+			case STATE_SUCCESS:
+				result.format("SUCCESS");
+				break;
+			case STATE_FAILURE:
+				result.format("FAILURE");
+				break;
+			default:
+				result.format("UNKNOWN %d", retType);
+				break;
+			}
+			if (!idle)
+				DEBUG_LOG((" - RETURNING %s\n", result.str()));
+		}
+	#endif
+	//end -extraLogging 
+
+	return retType;
 }
 
 //----------------------------------------------------------------------------------------------------------