Skip to content

- Restore quickstart, nologo, and noshellmap functionality #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
x64-dev merged 1 commit into from
Aug 15, 2026
+1 −35
Merged

- Restore quickstart, nologo, and noshellmap functionality #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
31 changes: 1 addition & 30 deletions GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -805,26 +801,13 @@ 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;
TheWritableGlobalData->m_playSizzle = FALSE;

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)
{
Expand All @@ -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;
Expand Down Expand Up @@ -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 },
Expand Down
Loading