diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h index 61c9ef70bef..a248ba5ddf9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h @@ -103,11 +103,6 @@ static int FRAME_GROUPING_CAP = 64; #define GENERALS_ONLINE_USE_SENTRY 1 #endif -// NOTE: This is temporary until we work out why this causes mismatch when some players set it and others dont -#if !_DEBUG -#define GENERALS_ONLINE_DISABLE_QUICKSTART_FUNCTIONALITY 1 -#endif - #define GENERALS_ONLINE_WIDESCREEN 1 #if defined(GENERALS_ONLINE_WIDESCREEN) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp index 35bacbb7161..d5d422a6066 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp @@ -789,10 +789,6 @@ Int parseSync(char *args[], int) Int parseNoShellMap(char *args[], int) { -#if defined(GENERALS_ONLINE_DISABLE_QUICKSTART_FUNCTIONALITY) - return 1; -#endif - TheWritableGlobalData->m_shellMapOn = FALSE; return 1; @@ -805,7 +801,6 @@ Int parseNoShaders(char *args[], int) return 1; } -#if defined(RTS_DEBUG) || !defined(GENERALS_ONLINE_DISABLE_QUICKSTART_FUNCTIONALITY) Int parseNoLogo(char *args[], int) { TheWritableGlobalData->m_playIntro = FALSE; @@ -813,18 +808,6 @@ Int parseNoLogo(char *args[], int) return 1; } -#endif - -Int parseNoSizzle( char *args[], int ) -{ -#if defined(GENERALS_ONLINE_DISABLE_QUICKSTART_FUNCTIONALITY) - return 1; -#endif - - TheWritableGlobalData->m_playSizzle = FALSE; - - return 1; -} Int parseShellMap(char *args[], int num) { @@ -851,17 +834,7 @@ Int parseWinCursors(char *args[], int num) Int parseQuickStart( char *args[], int num ) { -#if defined(GENERALS_ONLINE_DISABLE_QUICKSTART_FUNCTIONALITY) - return 1; -#endif - -#if defined(RTS_DEBUG) || !defined(GENERALS_ONLINE_DISABLE_QUICKSTART_FUNCTIONALITY) - 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; @@ -1195,9 +1168,7 @@ static CommandLineParam paramsForStartup[] = // These Params are parsed during Engine Init before INI data is loaded static CommandLineParam paramsForEngineInit[] = { -#if defined(RTS_DEBUG) || !defined(GENERALS_ONLINE_DISABLE_QUICKSTART_FUNCTIONALITY) { "-nologo", parseNoLogo }, // TheSuperHackers @tweak Is now available in Release builds. -#endif { "-noshellmap", parseNoShellMap }, { "-noShellAnim", parseNoWindowAnimation }, // TheSuperHackers @tweak Is now available in Release builds. { "-xres", parseXRes },