Merge branch 'main' into feature/savegameinfo

Author: Starkku

Private

@@ -33,23 +33,23 @@ void MainConfig::LoadFromINIFile()
 	const char* pOptionsSection = "Options";
 	if (pINI->GetSection(pOptionsSection))
 	{
-		this->MPDebug              = pINI->ReadBool(pOptionsSection, "MPDEBUG", this->MPDebug);
-		this->SingleProcAffinity   = pINI->ReadBool(pOptionsSection, "SingleProcAffinity", this->SingleProcAffinity);
+		this->AllowChat            = pINI->ReadBool(pOptionsSection, "AllowChat", this->AllowChat);
+		this->AllowTaunts          = pINI->ReadBool(pOptionsSection, "AllowTaunts", this->AllowTaunts);
+		this->DDrawHandlesClose    = pINI->ReadBool(pOptionsSection, "DDrawHandlesClose", this->DDrawHandlesClose);
 		this->DisableEdgeScrolling = pINI->ReadBool(pOptionsSection, "DisableEdgeScrolling", this->DisableEdgeScrolling);
+		this->MPDebug              = pINI->ReadBool(pOptionsSection, "MPDEBUG", this->MPDebug);
 		this->QuickExit            = pINI->ReadBool(pOptionsSection, "QuickExit", this->QuickExit);
+		this->SingleProcAffinity   = pINI->ReadBool(pOptionsSection, "SingleProcAffinity", this->SingleProcAffinity);
 		this->SkipScoreScreen      = pINI->ReadBool(pOptionsSection, "SkipScoreScreen", this->SkipScoreScreen);
-		this->DDrawHandlesClose    = pINI->ReadBool(pOptionsSection, "DDrawHandlesClose", this->DDrawHandlesClose);
 		this->SpeedControl         = pINI->ReadBool(pOptionsSection, "SpeedControl", this->SpeedControl);
-		this->AllowTaunts          = pINI->ReadBool(pOptionsSection, "AllowTaunts", this->AllowTaunts);
-		this->AllowChat            = pINI->ReadBool(pOptionsSection, "AllowChat", this->AllowChat);
 	}
 
 	const char* pVideoSection = "Video";
 	if (pINI->GetSection(pVideoSection))
 	{
-		this->WindowedMode   = pINI->ReadBool(pVideoSection, "Video.Windowed", this->WindowedMode);
-		this->NoWindowFrame  = pINI->ReadBool(pVideoSection, "NoWindowFrame", this->NoWindowFrame);
 		this->DDrawTargetFPS = pINI->ReadInteger(pVideoSection, "DDrawTargetFPS", this->DDrawTargetFPS);
+		this->NoWindowFrame  = pINI->ReadBool(pVideoSection, "NoWindowFrame", this->NoWindowFrame);
+		this->WindowedMode   = pINI->ReadBool(pVideoSection, "Video.Windowed", this->WindowedMode);
 	}
 }
 

YRpp

@@ -21,46 +21,50 @@
 class MainConfig
 {
 public:
-	bool MPDebug;
-	bool DumpTypes;
-	bool NoCD;
-	int RA2ModeSaveID;
-
-	bool SingleProcAffinity;
+	// Options
+	bool AllowChat;
+	bool AllowTaunts;
+	bool DDrawHandlesClose;
 	bool DisableEdgeScrolling;
+	bool MPDebug;
 	bool QuickExit;
+	bool SingleProcAffinity;
 	bool SkipScoreScreen;
-	bool DDrawHandlesClose;
 	bool SpeedControl;
 
-	bool WindowedMode;
+	// Video
 	bool NoWindowFrame;
-	int  DDrawTargetFPS;
-
-	bool AllowTaunts;
-	bool AllowChat;
+	bool WindowedMode;
+	int DDrawTargetFPS;
 
-	void LoadFromINIFile();
-	void ApplyStaticOptions();
+	// Other
+	bool DumpTypes;
+	bool NoCD;
+	int RA2ModeSaveID;
 
 	MainConfig()
-		: MPDebug { false }
-		, DumpTypes { false }
-		, NoCD { false }
-		, RA2ModeSaveID { 0 }
-
-		, SingleProcAffinity { true }
+		// Options
+		: AllowChat { true }
+		, AllowTaunts { true }
+		, DDrawHandlesClose { false }
 		, DisableEdgeScrolling { false }
+		, MPDebug { false }
 		, QuickExit { false }
+		, SingleProcAffinity { true }
 		, SkipScoreScreen { false }
-		, DDrawHandlesClose { false }
 		, SpeedControl { false }
 
-		, WindowedMode { false }
-		, NoWindowFrame { false }
+		// Video
 		, DDrawTargetFPS { -1 }
+		, NoWindowFrame { false }
+		, WindowedMode { false }
 
-		, AllowTaunts { true }
-		, AllowChat { true }
+		// Other
+		, DumpTypes { false }
+		, NoCD { false }
+		, RA2ModeSaveID { 0 }
 	{ }
+
+	void LoadFromINIFile();
+	void ApplyStaticOptions();
 };

src/Main.Config.cpp

@@ -26,12 +26,14 @@
 #include <Utilities/Macro.h>
 
 char Debug::StringBuffer[0x1000];
+char Debug::FinalStringBuffer[0x1000];
 
 void Debug::Log(const char* pFormat, ...)
 {
 	va_list args;
-	Debug::LogGame("[Spawner] ");
-	Debug::LogGame(pFormat, args);
+	va_start(args, pFormat);
+	vsprintf_s(FinalStringBuffer, pFormat, args);
+	LogGame("%s %s", "[Phobos]", FinalStringBuffer);
 	va_end(args);
 }
 

src/Main.Config.h

@@ -30,6 +30,7 @@ class Debug
 	};
 
 	static char StringBuffer[0x1000];
+	static char FinalStringBuffer[0x1000];
 
 	static void Log(const char* pFormat, ...);
 	static void LogGame(const char* pFormat, ...);