From 3fb292ac719c7b1e9be8523f13a14787e3de0b5f Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 6 May 2022 08:30:01 +0200
Subject: [PATCH] Revert "- added a bit of hackery so that compatmode CVAR can
 be set up on startup"

This reverts commit c4408d8536cf58a77a02409ee612694c240caaa0.

This does not work. It always overwrites the saved compatibility settings with the current compatmode.
---
 src/common/console/c_cvars.cpp | 5 +++--
 src/common/console/c_cvars.h   | 7 ++-----
 src/d_main.cpp                 | 4 +---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/common/console/c_cvars.cpp b/src/common/console/c_cvars.cpp
index db9008a95..c9b859f2d 100644
--- a/src/common/console/c_cvars.cpp
+++ b/src/common/console/c_cvars.cpp
@@ -55,6 +55,9 @@ struct FLatchedValue
 
 static TArray<FLatchedValue> LatchedValues;
 
+bool FBaseCVar::m_DoNoSet = false;
+bool FBaseCVar::m_UseCallback = false;
+
 FBaseCVar *CVars = NULL;
 
 int cvar_defflags;
@@ -520,7 +523,6 @@ void FBaseCVar::EnableNoSet ()
 
 void FBaseCVar::EnableCallbacks ()
 {
-	m_inEnable = true;
 	m_UseCallback = true;
 	FBaseCVar *cvar = CVars;
 
@@ -532,7 +534,6 @@ void FBaseCVar::EnableCallbacks ()
 		}
 		cvar = cvar->m_Next;
 	}
-	m_inEnable = false;
 }
 
 void FBaseCVar::DisableCallbacks ()
diff --git a/src/common/console/c_cvars.h b/src/common/console/c_cvars.h
index 1fed5261a..38462b077 100644
--- a/src/common/console/c_cvars.h
+++ b/src/common/console/c_cvars.h
@@ -210,17 +210,14 @@ protected:
 	uint32_t Flags;
 	bool inCallback = false;
 
-public:
-	static inline bool m_inEnable = false;
-
 private:
 	FBaseCVar (const FBaseCVar &var) = delete;
 	FBaseCVar (const char *name, uint32_t flags);
 	void (*m_Callback)(FBaseCVar &);
 	FBaseCVar *m_Next;
 
-	static inline bool m_UseCallback = false;
-	static inline bool m_DoNoSet = false;
+	static bool m_UseCallback;
+	static bool m_DoNoSet;
 
 	void *m_ExtraDataPointer;
 
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 47fcc7d1d..86515ce61 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -569,7 +569,6 @@ EXTERN_CVAR(Int, compatmode)
 
 CUSTOM_CVAR (Int, compatflags, 0, CVAR_ARCHIVE|CVAR_SERVERINFO | CVAR_NOINITCALL)
 {
-	if (FBaseCVar::m_inEnable) return;
 	for (auto Level : AllLevels())
 	{
 		Level->ApplyCompatibility();
@@ -578,7 +577,6 @@ CUSTOM_CVAR (Int, compatflags, 0, CVAR_ARCHIVE|CVAR_SERVERINFO | CVAR_NOINITCALL
 
 CUSTOM_CVAR (Int, compatflags2, 0, CVAR_ARCHIVE|CVAR_SERVERINFO | CVAR_NOINITCALL)
 {
-	if (FBaseCVar::m_inEnable) return;
 	for (auto Level : AllLevels())
 	{
 		Level->ApplyCompatibility2();
@@ -586,7 +584,7 @@ CUSTOM_CVAR (Int, compatflags2, 0, CVAR_ARCHIVE|CVAR_SERVERINFO | CVAR_NOINITCAL
 	}
 }
 
-CUSTOM_CVAR(Int, compatmode, 0, CVAR_ARCHIVE)
+CUSTOM_CVAR(Int, compatmode, 0, CVAR_ARCHIVE|CVAR_NOINITCALL)
 {
 	int v, w = 0;