From 31ea8ea855ec065dcdd01e79ed54fd3349d59213 Mon Sep 17 00:00:00 2001
From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 25 Oct 2015 20:15:34 +1100
Subject: [PATCH] Cvar: fix non updating autocvars

---
 qcsrc/lib/cvar.qh | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/qcsrc/lib/cvar.qh b/qcsrc/lib/cvar.qh
index e30de507b..5ee3222bc 100644
--- a/qcsrc/lib/cvar.qh
+++ b/qcsrc/lib/cvar.qh
@@ -2,6 +2,7 @@
 #define CVAR_H
 
 #include "nil.qh"
+#include "progname.qh"
 #include "static.qh"
 
 void RegisterCvars(void(string name, string def, string desc, bool archive, string file) f) { }
@@ -16,23 +17,35 @@ string MakeConsoleSafe(string input)
 	return input;
 }
 
+void cvar_describe(string name, string desc) {
+    localcmd(sprintf("\nset %1$s \"$%1$s\" \"%2$s\"\n", name, MakeConsoleSafe(desc)));
+}
+
+void cvar_archive(string name) {
+    localcmd(sprintf("\nseta %1$s \"$%1$s\"\n", name));
+}
+
 void RegisterCvars_Set(string name, string def, string desc, bool archive, string file)
 {
-    string val = string_null;
-    if (cvar_type(name) & CVAR_TYPEFLAG_EXISTS) {
-        val = cvar_string(name);
-        // Need to unset first to change the default
-        localcmd(sprintf("\nunset %s\n", name));
-    }
-    localcmd(sprintf("\n%s %s \"%s\" \"%s\"\n", (archive ? "seta" : "set"), name, MakeConsoleSafe(def), MakeConsoleSafe(desc)));
-    if (val) {
-        localcmd(sprintf("\n%s \"%s\"\n", name, MakeConsoleSafe(val)));
-    }
+    cvar_describe(name, desc);
+    if (archive) cvar_archive(name);
 }
 
-#ifndef SVQC
-STATIC_INIT_LATE(Cvars) { RegisterCvars(RegisterCvars_Set); }
-#endif
+int RegisterCvars_Save_fd;
+void RegisterCvars_Save(string name, string def, string desc, bool archive, string file)
+{
+    if (!archive) return;
+    fputs(RegisterCvars_Save_fd, sprintf("seta %s \"%s\"\n", name, def));
+}
+
+STATIC_INIT_LATE(Cvars) {
+    RegisterCvars(RegisterCvars_Set);
+    RegisterCvars_Save_fd = fopen(sprintf("default%s.cfg", PROGNAME), FILE_WRITE);
+    if (RegisterCvars_Save_fd >= 0) {
+        RegisterCvars(RegisterCvars_Save);
+        fclose(RegisterCvars_Save_fd);
+    }
+}
 
 const noref bool default_bool = false;
 const noref int default_int = 0;
-- 
2.39.2