From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 31 Aug 2015 10:08:06 +0000 (+1000)
Subject: Capture __FILE__ with AUTOCVAR
X-Git-Tag: xonotic-v0.8.2~1940
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=33a622888e895b345d10f4625f7f84299565f95f;p=xonotic%2Fxonotic-data.pk3dir.git

Capture __FILE__ with AUTOCVAR
---

diff --git a/qcsrc/lib/Cvar.qh b/qcsrc/lib/Cvar.qh
index 914bed97a..02016a251 100644
--- a/qcsrc/lib/Cvar.qh
+++ b/qcsrc/lib/Cvar.qh
@@ -3,21 +3,21 @@
 
 #include "Static.qh"
 
-void RegisterCvars(void(string name, string desc, bool archive) f) { }
+void RegisterCvars(void(string name, string desc, bool archive, string file) f) { }
 
-void RegisterCvars_Set(string name, string desc, bool archive)
+void RegisterCvars_Set(string name, string desc, bool archive, string file)
 {
     localcmd(sprintf("\n%1$s %2$s \"$%2$s\" \"%3$s\"\n", (archive ? "seta" : "set"), name, desc));
 }
 
 STATIC_INIT_LATE(Cvars) { RegisterCvars(RegisterCvars_Set); }
 
-#define AUTOCVAR_4(archive, var, type, desc) \
-    [[accumulate]] void RegisterCvars(void(string, string, bool) f) { f(#var, desc, archive); } \
+#define AUTOCVAR_5(file, archive, var, type, desc) \
+    [[accumulate]] void RegisterCvars(void(string, string, bool, string) f) { f(#var, desc, archive, file); } \
     type autocvar_##var
-#define AUTOCVAR_5(archive, var, type, default, desc) \
-    AUTOCVAR_4(archive, var, type, desc) = default
-#define _AUTOCVAR(...) OVERLOAD(AUTOCVAR, __VA_ARGS__)
+#define AUTOCVAR_6(file, archive, var, type, default, desc) \
+    AUTOCVAR_5(file, archive, var, type, desc) = default
+#define _AUTOCVAR(...) OVERLOAD(AUTOCVAR, __FILE__, __VA_ARGS__)
 #define AUTOCVAR_SAVE(...) _AUTOCVAR(true, __VA_ARGS__)
 #define AUTOCVAR(...) _AUTOCVAR(false, __VA_ARGS__)