Fix #2199 "sv_cmd dumpturrets doesn't work". The new implementation is similar to...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / config.qh

diff --git a/qcsrc/common/turrets/config.qh b/qcsrc/common/turrets/config.qh
index 85cbd2006c75e7abedfe63c81fe555788225b1a0..2c47be09116de219715ec4c3bc9714d07972ed44 100644 (file)
--- a/qcsrc/common/turrets/config.qh
+++ b/qcsrc/common/turrets/config.qh
@@ -1,34 +1,26 @@
-#ifndef TURRETS_CONFIG_H
-#define TURRETS_CONFIG_H
+#pragma once
 
 #ifdef SVQC
 
-void Dump_Turret_Settings(void);
+void Dump_Turret_Settings();
 float tur_config_file;
 float tur_config_alsoprint;
 
-#define MAX_TUR_CONFIG 256
 float TUR_CONFIG_COUNT;
-string tur_config_queue[MAX_TUR_CONFIG];
-
 #define TUR_CONFIG_QUEUE(a) { \
-       tur_config_queue[TUR_CONFIG_COUNT] = a; \
+       config_queue[TUR_CONFIG_COUNT] = a; \
        ++TUR_CONFIG_COUNT; }
 
-#define TUR_CONFIG_WRITETOFILE(a) { \
-       fputs(tur_config_file, a); \
-       if(tur_config_alsoprint) { print(a); } }
-
-#define TUR_CONFIG_WRITE_CVARS(turret,name) \
-               { TUR_CONFIG_QUEUE( \
-                       sprintf("set g_turrets_unit_%s_%s %g\n", #turret, #name, \
-                       cvar(sprintf("g_turrets_unit_%s_%s", #turret, #name)))) } \
+#define TUR_CONFIG_WRITE_CVARS(turname, name, T) TUR_CONFIG_WRITE_PROPS_##T(turname, name)
 
-#define TUR_CONFIG_SETTINGS(tursettings) \
-       #define TUR_ADD_CVAR(turret,name) TUR_CONFIG_WRITE_CVARS(turret,name) \
-       tursettings \
-       #undef TUR_ADD_CVAR
+#define TUR_CONFIG_WRITE_PROPS_string(turname, name) \
+       { TUR_CONFIG_QUEUE( \
+               sprintf("set g_turrets_unit_%s_%s \"%s\"\n", #turname, #name, \
+               cvar_string(sprintf("g_turrets_unit_%s_%s", #turname, #name)))) }
 
-#endif
+#define TUR_CONFIG_WRITE_PROPS_float(turname, name) \
+       { TUR_CONFIG_QUEUE( \
+               sprintf("set g_turrets_unit_%s_%s %g\n", #turname, #name, \
+               cvar(sprintf("g_turrets_unit_%s_%s", #turname, #name)))) }
 
 #endif