From 8b88f14c96dc7a70c601fbd08c9b9cf8de546496 Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans91@ksu.edu>
Date: Mon, 1 Dec 2014 21:04:50 -0600
Subject: [PATCH] Destroy mod-created CVars when 'restart' is invoked

---
 src/c_cvars.cpp | 16 ++++++++++++++++
 src/c_cvars.h   |  4 ++++
 src/d_main.cpp  |  1 +
 3 files changed, 21 insertions(+)

diff --git a/src/c_cvars.cpp b/src/c_cvars.cpp
index ce4e88632..c770bcbcf 100644
--- a/src/c_cvars.cpp
+++ b/src/c_cvars.cpp
@@ -1515,6 +1515,22 @@ void UnlatchCVars (void)
 	}
 }
 
+void DestroyCVarsFlagged (DWORD flags)
+{
+	FBaseCVar *cvar = CVars;
+	FBaseCVar *next = cvar;
+
+	while(cvar)
+	{
+		next = cvar->m_Next;
+
+		if(cvar->Flags & flags)
+			delete cvar;
+
+		cvar = next;
+	}
+}
+
 void C_SetCVarsToDefaults (void)
 {
 	FBaseCVar *cvar = CVars;
diff --git a/src/c_cvars.h b/src/c_cvars.h
index 17d3f7b1d..ed2b16755 100644
--- a/src/c_cvars.h
+++ b/src/c_cvars.h
@@ -159,6 +159,7 @@ private:
 	friend FBaseCVar *FindCVar (const char *var_name, FBaseCVar **prev);
 	friend FBaseCVar *FindCVarSub (const char *var_name, int namelen);
 	friend void UnlatchCVars (void);
+	friend void DestroyCVarsFlagged (DWORD flags);
 	friend void C_ArchiveCVars (FConfigFile *f, uint32 filter);
 	friend void C_SetCVarsToDefaults (void);
 	friend void FilterCompactCVars (TArray<FBaseCVar *> &cvars, uint32 filter);
@@ -190,6 +191,9 @@ FBaseCVar *C_CreateCVar(const char *var_name, ECVarType var_type, DWORD flags);
 // Called from G_InitNew()
 void UnlatchCVars (void);
 
+// Destroy CVars with the matching flags; called from CCMD(restart)
+void DestroyCVarsFlagged (DWORD flags);
+
 // archive cvars to FILE f
 void C_ArchiveCVars (FConfigFile *f, uint32 filter);
 
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 4fea35301..2ceec3926 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -2578,6 +2578,7 @@ void D_DoomMain (void)
 			new (&gameinfo) gameinfo_t;		// Reset gameinfo
 			S_Shutdown();					// free all channels and delete playlist
 			C_ClearAliases();				// CCMDs won't be reinitialized so these need to be deleted here
+			DestroyCVarsFlagged(CVAR_MOD);	// Delete any cvar left by mods
 
 			GC::FullGC();					// perform one final garbage collection before deleting the class data
 			PClass::ClearRuntimeData();		// clear all runtime generated class data