From 912b6a47c120b79734f3037ac5e7277bffdb9dcb Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 6 Nov 2022 17:47:21 +0100
Subject: [PATCH] - migrate cl_savedir to save_dir

---
 source/core/gameconfigfile.cpp | 24 +++++++++++++++++++-----
 source/core/savegamehelp.cpp   |  2 --
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/source/core/gameconfigfile.cpp b/source/core/gameconfigfile.cpp
index d8db65e0d..75d15d784 100644
--- a/source/core/gameconfigfile.cpp
+++ b/source/core/gameconfigfile.cpp
@@ -45,7 +45,7 @@
 #include "gamecontrol.h"
 #include "version.h"
 
-#define LASTRUNVERSION "3"
+#define LASTRUNVERSION "4"
 
 #if !defined _MSC_VER && !defined __APPLE__
 #include "i_system.h"  // for SHARE_DIR
@@ -291,8 +291,8 @@ void FGameConfigFile::DoGlobalSetup ()
 			double last = atof (lastver);
 			if (last < 2)
 			{
-				auto var = FindCVar("mod_dumb_mastervolume", NULL);
-				if (var != NULL)
+				auto var = FindCVar("mod_dumb_mastervolume", nullptr);
+				if (var != nullptr)
 				{
 					UCVarValue v = var->GetGenericRep(CVAR_Float);
 					v.Float /= 4.f;
@@ -302,14 +302,28 @@ void FGameConfigFile::DoGlobalSetup ()
 			}
 			if (last < 3)
 			{
-				auto var = FindCVar("hud_size", NULL);
-				if (var != NULL)
+				auto var = FindCVar("hud_size", nullptr);
+				if (var != nullptr)
 				{
 					UCVarValue v = var->GetGenericRep(CVAR_Int);
 					if(v.Int == Hud_Althud) v.Int = Hud_Nothing;
 					var->SetGenericRep(v, CVAR_Int);
 				}
 			}
+			if (last < 4)
+			{
+				auto var = FindCVar("cl_savedir", nullptr);
+				auto var2 = FindCVar("save_dir", nullptr);
+				if (var != nullptr && var2 != nullptr)
+				{
+					UCVarValue v = var->GetGenericRep(CVAR_String);
+					UCVarValue v2 = var2->GetGenericRep(CVAR_String);
+					if (*v.String != 0 && *v2.String == 0)
+					{
+						var2->SetGenericRep(v, CVAR_String);
+					}
+				}
+			}
 		}
 	}
 }
diff --git a/source/core/savegamehelp.cpp b/source/core/savegamehelp.cpp
index 38ffdebe2..5f16b3d4f 100644
--- a/source/core/savegamehelp.cpp
+++ b/source/core/savegamehelp.cpp
@@ -74,8 +74,6 @@ int SaveVersion;
 
 void SerializeMap(FSerializer &arc);
 
-CVAR(String, cl_savedir, "", CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
-
 BEGIN_BLD_NS
 FSerializer& Serialize(FSerializer& arc, const char* keyname, XWALL& w, XWALL* def);
 FSerializer& Serialize(FSerializer& arc, const char* keyname, XSECTOR& w, XSECTOR* def);