Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,8 @@ void ArchiveFileSystem::loadMods()
{
#if defined(GENERALS_ONLINE) && defined(GENERALS_ONLINE_COMMUNITY_PATCH_CHANGES)
// load community data patch BIG
if (NGMP_OnlineServicesManager::Settings.DataPacks_UseCommunityPatch())
if (NGMP_OnlineServicesManager::Settings.DataPacks_UseCommunityPatch()
&& !TheGlobalData->m_commandLineData.isCommunityDataPatchDisabled())
{
std::string strBigPath = std::format("{}GeneralsOnlineGameData/500_900_CommunityPatch_CoreINI.big", TheGlobalData->getPath_UserData().str());
bool bLoaded = false;
Expand Down
7 changes: 7 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,20 @@ class CommandLineData
friend class CommandLine;
friend class GlobalData;

public:
Bool isCommunityDataPatchDisabled() const { return m_disableCommunityDataPatch; }
void disableCommunityDataPatch() { m_disableCommunityDataPatch = true; }

private:
CommandLineData()
: m_hasParsedCommandLineForStartup(false)
, m_hasParsedCommandLineForEngineInit(false)
, m_disableCommunityDataPatch(false)
{}

Bool m_hasParsedCommandLineForStartup;
Bool m_hasParsedCommandLineForEngineInit;
Bool m_disableCommunityDataPatch;
};

//-------------------------------------------------------------------------------------------------
Expand Down
8 changes: 8 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,13 @@ Int parseMod(char *args[], Int num)
return 1;
}

Int parseDisableCommunityDataPatch(char *args[], Int num)
{
TheWritableGlobalData->m_commandLineData.disableCommunityDataPatch();

return 1;
}

#ifdef DEBUG_LOGGING
Int parseSetDebugLevel(char *args[], int num)
{
Expand Down Expand Up @@ -1207,6 +1214,7 @@ static CommandLineParam paramsForEngineInit[] =
{ "-scriptDebug", parseScriptDebug },
{ "-playStats", parsePlayStats },
{ "-mod", parseMod },
{ "-disableCommunityDataPatch", parseDisableCommunityDataPatch },
{ "-noshaders", parseNoShaders },
{ "-quickstart", parseQuickStart },
{ "-useWaveEditor", parseUseWaveEditor },
Expand Down
Loading