refactor: Dedup by calling reset in the init of GameLogic

Author: stephanmeesters

Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -370,9 +370,6 @@ void GameLogic::init( void )
 
 	setFPMode();
 
-	/// @todo Clear object and destroy lists
-	setDefaults( FALSE );
-
 	// create the partition manager
 	ThePartitionManager = NEW PartitionManager;
 	ThePartitionManager->init();
@@ -400,32 +397,8 @@ void GameLogic::init( void )
 	//DEBUG_ASSERTCRASH(ThePlayerList, ("null ThePlayerList"));
 	//ThePlayerList->setLocalPlayer(0);
 
-	m_CRC = 0;
-	m_pauseFrame = 0;
-	m_gamePaused = FALSE;
-	m_pauseSound = FALSE;
-	m_pauseMusic = FALSE;
-	m_pauseInput = FALSE;
-	m_inputEnabledMemory = TRUE;
-	m_mouseVisibleMemory = TRUE;
-	m_logicTimeScaleEnabledMemory = FALSE;
-
-	for(Int i = 0; i < MAX_SLOTS; ++i)
-	{
-		m_progressComplete[i] = FALSE;
-		m_progressCompleteTimeout[i] = 0;
-	}
-	m_forceGameStartByTimeOut = FALSE;
-
-	m_isScoringEnabled = TRUE;
-	m_showBehindBuildingMarkers = TRUE;
-	m_drawIconUI = TRUE;
-	m_showDynamicLOD = TRUE;
-	m_scriptHulkMaxLifetimeOverride = -1;
-
+	reset();
 	m_isInUpdate = FALSE;
-
-	m_rankPointsToAddAtGameStart = 0;
 }
 
 //-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -338,7 +338,6 @@ void GameLogic::destroyAllObjectsImmediate()
 // ------------------------------------------------------------------------------------------------
 GameLogic::~GameLogic()
 {
-
 	// clear any object TOC we might have
 	m_objectTOC.clear();
 
@@ -382,18 +381,13 @@ GameLogic::~GameLogic()
 // ------------------------------------------------------------------------------------------------
 void GameLogic::init( void )
 {
-
 	setFPMode();
 
-	/// @todo Clear object and destroy lists
-	setDefaults( FALSE );
-
 	// create the partition manager
 	ThePartitionManager = NEW PartitionManager;
 	ThePartitionManager->init();
 	ThePartitionManager->setName("ThePartitionManager");
 
-
 	// Create system for holding deleted objects that are
 	// still in the partition manager because player has a fogged
 	// view of them.
@@ -411,36 +405,8 @@ void GameLogic::init( void )
 	TheScriptEngine->init();
 	TheScriptEngine->setName("TheScriptEngine");
 
-	// create a team for the player
-	//DEBUG_ASSERTCRASH(ThePlayerList, ("null ThePlayerList"));
-	//ThePlayerList->setLocalPlayer(0);
-
-	m_CRC = 0;
-	m_pauseFrame = 0;
-	m_gamePaused = FALSE;
-	m_pauseSound = FALSE;
-	m_pauseMusic = FALSE;
-	m_pauseInput = FALSE;
-	m_inputEnabledMemory = TRUE;
-	m_mouseVisibleMemory = TRUE;
-	m_logicTimeScaleEnabledMemory = FALSE;
-
-	for(Int i = 0; i < MAX_SLOTS; ++i)
-	{
-		m_progressComplete[i] = FALSE;
-		m_progressCompleteTimeout[i] = 0;
-	}
-	m_forceGameStartByTimeOut = FALSE;
-
-	m_isScoringEnabled = TRUE;
-	m_showBehindBuildingMarkers = TRUE;
-	m_drawIconUI = TRUE;
-	m_showDynamicLOD = TRUE;
-	m_scriptHulkMaxLifetimeOverride = -1;
-
+	reset();
 	m_isInUpdate = FALSE;
-
-	m_rankPointsToAddAtGameStart = 0;
 }
 
 //-------------------------------------------------------------------------------------------------