diff --git a/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp index 661caa280af..09c9258d8c7 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp @@ -780,7 +780,6 @@ Int parseNoShaders(char *args[], int) return 1; } -#if defined(RTS_DEBUG) Int parseNoLogo(char *args[], int) { TheWritableGlobalData->m_playIntro = FALSE; @@ -789,14 +788,6 @@ Int parseNoLogo(char *args[], int) return 1; } -#endif - -Int parseNoSizzle( char *args[], int ) -{ - TheWritableGlobalData->m_playSizzle = FALSE; - - return 1; -} Int parseShellMap(char *args[], int num) { @@ -823,13 +814,7 @@ Int parseWinCursors(char *args[], int num) Int parseQuickStart( char *args[], int num ) { -#if defined(RTS_DEBUG) - 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 + parseNoLogo( args, num ); parseNoShellMap( args, num ); parseNoWindowAnimation( args, num ); return 1; @@ -1168,7 +1153,9 @@ static CommandLineParam paramsForStartup[] = // These Params are parsed during Engine Init before INI data is loaded static CommandLineParam paramsForEngineInit[] = { + { "-nologo", parseNoLogo }, // TheSuperHackers @tweak Is now available in Release builds. { "-noshellmap", parseNoShellMap }, + { "-noShellAnim", parseNoWindowAnimation }, // TheSuperHackers @tweak Is now available in Release builds. { "-xres", parseXRes }, { "-yres", parseYRes }, { "-fullVersion", parseFullVersion }, @@ -1294,9 +1281,7 @@ static CommandLineParam paramsForEngineInit[] = { "-noshadowvolumes", parseNoShadows }, { "-nofx", parseNoFX }, { "-ignoresync", parseSync }, - { "-nologo", parseNoLogo }, { "-shellmap", parseShellMap }, - { "-noShellAnim", parseNoWindowAnimation }, { "-winCursors", parseWinCursors }, { "-constantDebug", parseConstantDebug }, { "-seed", parseSeed }, @@ -1307,7 +1292,6 @@ static CommandLineParam paramsForEngineInit[] = { "-updateImages", parseUpdateImages }, { "-showTeamDot", parseShowTeamDot }, { "-extraLogging", parseExtraLogging }, - #endif #ifdef DEBUG_LOGGING