refactor: Move archive setting to the recorder class

Author: Stubbjax

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

@@ -392,7 +392,6 @@ class GlobalData : public SubsystemInterface
 																			 smaller area within the rectangle to order the gather. */
 
 	Int m_antiAliasBoxValue;          ///< value of selected antialias from combo box in options menu
-	Bool m_archiveReplays;						///< if true, each replay is archived to the replay archive folder after recording
 	Bool m_languageFilterPref;        ///< Bool if user wants to filter language
 	Bool m_loadScreenDemo;						///< Bool if true, run the loadscreen demo movie
 	Bool m_disableRender;							///< if true, no rendering!

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

@@ -169,6 +169,7 @@ class RecorderClass : public SubsystemInterface {
 	Bool m_wasDesync;
 
 	Bool m_doingAnalysis;
+	Bool m_archiveReplays;														///< if true, each replay is archived to the replay archive folder after recording
 
 	Int m_originalGameMode; // valid in replays
 

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

@@ -920,7 +920,6 @@ GlobalData::GlobalData()
 	m_standardPublicBones.clear();
 
 	m_antiAliasBoxValue = 0;
-	m_archiveReplays = false;
 
 //	m_languageFilterPref = false;
 	m_languageFilterPref = true;
@@ -1175,7 +1174,6 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 
 	// override INI values with user preferences
 	OptionPreferences optionPref;
-	TheWritableGlobalData->m_archiveReplays = optionPref.getArchiveReplaysEnabled();
  	TheWritableGlobalData->m_useAlternateMouse = optionPref.getAlternateMouseModeEnabled();
 	TheWritableGlobalData->m_keyboardScrollFactor = optionPref.getScrollFactor();
 	TheWritableGlobalData->m_drawScrollAnchor = optionPref.getDrawScrollAnchor();

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

@@ -45,6 +45,7 @@
 #include "GameLogic/GameLogic.h"
 #include "Common/RandomValue.h"
 #include "Common/CRCDebug.h"
+#include "Common/UserPreferences.h"
 #include "Common/version.h"
 
 constexpr const char s_genrep[] = "GENREP";
@@ -370,6 +371,7 @@ RecorderClass::RecorderClass()
 	//Added By Sadullah Nader
 	//Initializtion(s) inserted
 	m_doingAnalysis = FALSE;
+	m_archiveReplays = FALSE;
 	m_nextFrame = 0;
 	m_wasDesync = FALSE;
 	//
@@ -406,6 +408,9 @@ void RecorderClass::init() {
 	m_wasDesync = FALSE;
 	m_doingAnalysis = FALSE;
 	m_playbackFrameCount = 0;
+
+	OptionPreferences optionPref;
+	m_archiveReplays = optionPref.getArchiveReplaysEnabled();
 }
 
 /**
@@ -727,7 +732,7 @@ void RecorderClass::stopRecording() {
 		m_file->close();
 		m_file = NULL;
 
-		if (TheGlobalData->m_archiveReplays)
+		if (m_archiveReplays)
 			archiveReplay(m_fileName);
 	}
 	m_fileName.clear();

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp

@@ -314,7 +314,7 @@ Bool OptionPreferences::getArchiveReplaysEnabled() const
 {
 	OptionPreferences::const_iterator it = find("ArchiveReplays");
 	if (it == end())
-		return TheGlobalData->m_archiveReplays;
+		return FALSE;
 
 	if (stricmp(it->second.str(), "yes") == 0) {
 		return TRUE;

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

@@ -400,7 +400,6 @@ class GlobalData : public SubsystemInterface
 																			 smaller area within the rectangle to order the gather. */
 
 	Int m_antiAliasBoxValue;          ///< value of selected antialias from combo box in options menu
-	Bool m_archiveReplays;						///< if true, each replay is archived to the replay archive folder after recording
 	Bool m_languageFilterPref;        ///< Bool if user wants to filter language
 	Bool m_loadScreenDemo;						///< Bool if true, run the loadscreen demo movie
 	Bool m_disableRender;							///< if true, no rendering!

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

@@ -169,6 +169,7 @@ class RecorderClass : public SubsystemInterface {
 	Bool m_wasDesync;
 
 	Bool m_doingAnalysis;
+	Bool m_archiveReplays;														///< if true, each replay is archived to the replay archive folder after recording
 
 	Int m_originalGameMode; // valid in replays
 

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

@@ -929,7 +929,6 @@ GlobalData::GlobalData()
 	m_standardPublicBones.clear();
 
 	m_antiAliasBoxValue = 0;
-	m_archiveReplays = false;
 
 //	m_languageFilterPref = false;
 	m_languageFilterPref = true;
@@ -1201,7 +1200,6 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 
 	// override INI values with user preferences
 	OptionPreferences optionPref;
-	TheWritableGlobalData->m_archiveReplays = optionPref.getArchiveReplaysEnabled();
 	TheWritableGlobalData->m_useAlternateMouse = optionPref.getAlternateMouseModeEnabled();
 	TheWritableGlobalData->m_clientRetaliationModeEnabled = optionPref.getRetaliationModeEnabled();
 	TheWritableGlobalData->m_doubleClickAttackMove = optionPref.getDoubleClickAttackMoveEnabled();

GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp

@@ -45,6 +45,7 @@
 #include "GameLogic/GameLogic.h"
 #include "Common/RandomValue.h"
 #include "Common/CRCDebug.h"
+#include "Common/UserPreferences.h"
 #include "Common/version.h"
 
 constexpr const char s_genrep[] = "GENREP";
@@ -370,6 +371,7 @@ RecorderClass::RecorderClass()
 	//Added By Sadullah Nader
 	//Initializtion(s) inserted
 	m_doingAnalysis = FALSE;
+	m_archiveReplays = FALSE;
 	m_nextFrame = 0;
 	m_wasDesync = FALSE;
 	//
@@ -406,6 +408,9 @@ void RecorderClass::init() {
 	m_wasDesync = FALSE;
 	m_doingAnalysis = FALSE;
 	m_playbackFrameCount = 0;
+
+	OptionPreferences optionPref;
+	m_archiveReplays = optionPref.getArchiveReplaysEnabled();
 }
 
 /**
@@ -729,7 +734,7 @@ void RecorderClass::stopRecording() {
 		m_file->close();
 		m_file = NULL;
 
-		if (TheGlobalData->m_archiveReplays)
+		if (m_archiveReplays)
 			archiveReplay(m_fileName);
 	}
 	m_fileName.clear();

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp

@@ -323,7 +323,7 @@ Bool OptionPreferences::getArchiveReplaysEnabled() const
 {
 	OptionPreferences::const_iterator it = find("ArchiveReplays");
 	if (it == end())
-		return TheGlobalData->m_archiveReplays;
+		return FALSE;
 
 	if (stricmp(it->second.str(), "yes") == 0) {
 		return TRUE;