remove muliinstance branch wip

Author: githubawn

Core/GameEngine/Include/Common/OptionPreferences.h

@@ -128,4 +128,6 @@ class OptionPreferences : public UserPreferences
 	Real getResolutionFontAdjustment();
 
 	Bool getShowMoneyPerMinute() const;
+	Bool getIsMultiInstance() const;
+	static Bool readIsMultiInstanceFromPrimaryIni();
 };

Core/GameEngine/Source/Common/OptionPreferences.cpp

@@ -872,3 +872,24 @@ Bool OptionPreferences::getShowMoneyPerMinute() const
 	}
 	return FALSE;
 }
+
+Bool OptionPreferences::getIsMultiInstance() const
+{
+	OptionPreferences::const_iterator it = find("IsMultiInstance");
+	if (it == end())
+		return FALSE;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool OptionPreferences::readIsMultiInstanceFromPrimaryIni()
+{
+	OptionPreferences op;
+	// We call getBool directly to avoid the const_iterator logic in getIsMultiInstance which defaults to FALSE.
+	// We want to default to TRUE for multi-instance if not specified (legacy behavior for debug).
+	return op.getBool("IsMultiInstance", TRUE);
+}

Core/GameEngine/Source/Common/System/Debug.cpp

@@ -61,6 +61,7 @@
 #include "Common/CommandLine.h"
 #include "Common/Debug.h"
 #include "Common/CRCDebug.h"
+#include "Common/OptionPreferences.h"
 #include "Common/UnicodeString.h"
 #include "GameClient/ClientInstance.h"
 #include "GameClient/GameText.h"
@@ -373,6 +374,8 @@ void DebugInit(int flags)
 		// Determine the client instance id before creating the log file with an instance specific name.
 		CommandLine::parseCommandLineForStartup();
 
+		rts::ClientInstance::setMultiInstance(OptionPreferences::readIsMultiInstanceFromPrimaryIni());
+
 		if (!rts::ClientInstance::initialize())
 			return;
 

Core/GameEngine/Source/GameClient/ClientInstance.cpp

@@ -25,11 +25,8 @@ namespace rts
 HANDLE ClientInstance::s_mutexHandle = nullptr;
 UnsignedInt ClientInstance::s_instanceIndex = 0;
 
-#if defined(RTS_MULTI_INSTANCE)
 Bool ClientInstance::s_isMultiInstance = true;
-#else
-Bool ClientInstance::s_isMultiInstance = false;
-#endif
+
 
 bool ClientInstance::initialize()
 {

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

@@ -90,6 +90,7 @@ class GlobalData : public SubsystemInterface
 
 	static void parseGameDataDefinition( INI* ini );
 	void parseCustomDefinition();
+	void initUserDataPath();
 
 	//-----------------------------------------------------------------------------------------------
 	struct TerrainLighting

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

@@ -1040,6 +1040,8 @@ GlobalData::GlobalData()
 
 	m_clientRetaliationModeEnabled = TRUE; //On by default.
 
+	m_userDataLeafName = "Command and Conquer Generals Data";
+	m_userDataDir = BuildUserDataPathFromIni(m_userDataLeafName);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1181,7 +1183,7 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 	ini->initFromINI( TheWritableGlobalData, s_GlobalDataFieldParseTable );
 
 	TheWritableGlobalData->m_userDataDir.clear();
-	TheWritableGlobalData->m_userDataDir = BuildUserDataPathFromIni();
+	TheWritableGlobalData->m_userDataDir = BuildUserDataPathFromIni(m_userDataLeafName);
 	CreateDirectory(TheWritableGlobalData->m_userDataDir.str(), nullptr);
 
 	// override INI values with user preferences
@@ -1360,7 +1362,7 @@ AsciiString GlobalData::BuildUserDataPathFromIni()
 		if (!myDocumentsDirectory.endsWith("\\"))
 			myDocumentsDirectory.concat('\\');
 
-		myDocumentsDirectory.concat(TheWritableGlobalData->m_userDataLeafName.str());
+		myDocumentsDirectory.concat(leafName.str());
 
 		if (!myDocumentsDirectory.endsWith("\\"))
 			myDocumentsDirectory.concat('\\');

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

@@ -91,6 +91,7 @@ class GlobalData : public SubsystemInterface
 
 	static void parseGameDataDefinition( INI* ini );
 	void parseCustomDefinition();
+	void initUserDataPath();
 
 	//-----------------------------------------------------------------------------------------------
 	struct TerrainLighting

cmake/config-debug.cmake

@@ -12,7 +12,6 @@ set_property(CACHE RTS_DEBUG_PROFILE PROPERTY STRINGS DEFAULT ON OFF)
 
 option(RTS_DEBUG_CHEATS "Enables debug cheats in release builds" OFF)
 option(RTS_DEBUG_INCLUDE_DEBUG_LOG_IN_CRC_LOG "Includes normal debug log in crc log" OFF)
-option(RTS_DEBUG_MULTI_INSTANCE "Enables multi client instance support" OFF)
 
 
 # Helper macro that handles DEFAULT ON OFF options
@@ -38,7 +37,6 @@ define_debug_option(RTS_DEBUG_PROFILE    DEBUG_PROFILE    DISABLE_DEBUG_PROFILE
 
 add_feature_info(DebugCheats RTS_DEBUG_CHEATS "Build with Debug Cheats in release builds")
 add_feature_info(DebugIncludeDebugLogInCrcLog RTS_DEBUG_INCLUDE_DEBUG_LOG_IN_CRC_LOG "Build with Debug Logging in CRC log")
-add_feature_info(DebugMultiInstance RTS_DEBUG_MULTI_INSTANCE "Build with Multi Client Instance support")
 
 
 if(RTS_DEBUG_CHEATS)
@@ -49,6 +47,3 @@ if(RTS_DEBUG_INCLUDE_DEBUG_LOG_IN_CRC_LOG)
     target_compile_definitions(core_config INTERFACE INCLUDE_DEBUG_LOG_IN_CRC_LOG)
 endif()
 
-if(RTS_DEBUG_MULTI_INSTANCE)
-    target_compile_definitions(core_config INTERFACE RTS_MULTI_INSTANCE)
-endif()