Fix FL_WEAPON flag overlapping FL_JUMPRELEASED. This unintentional change was introdu...

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

diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh
index 4e968ec4e518629d0a1dd9c9f8319b901e75fef0..b842684984cc8dce14f35866716faacc3f26b45c 100644 (file)
--- a/qcsrc/common/weapons/config.qh
+++ b/qcsrc/common/weapons/config.qh
@@ -1,49 +1,29 @@
-#ifndef WEAPONS_CONFIG_H
-#define WEAPONS_CONFIG_H
+#pragma once
 
+#ifdef SVQC
 // ==========================
 //  Balance Config Generator
 // ==========================
 
-void Dump_Weapon_Settings(void);
+void Dump_Weapon_Settings();
 int wep_config_file;
 bool wep_config_alsoprint;
 
-const int MAX_WEP_CONFIG = 256;
 int WEP_CONFIG_COUNT;
-string wep_config_queue[MAX_WEP_CONFIG];
+void W_Config_Queue(string setting);
 
-#define WEP_CONFIG_QUEUE(a) { \
-       wep_config_queue[WEP_CONFIG_COUNT] = a; \
-       ++WEP_CONFIG_COUNT; }
+#define WEP_CONFIG_WRITE_CVARS(wepname, name, T) WEP_CONFIG_WRITE_PROPS_##T(wepname, name)
 
-#define WEP_CONFIG_WRITETOFILE(a) do { \
-       fputs(wep_config_file, a); \
-       if(wep_config_alsoprint) { print(a); } \
-} while(0)
-
-#define WEP_CONFIG_WRITE_CVARS_NONE(wepname,name) \
-       { WEP_CONFIG_QUEUE( \
-               sprintf("set g_balance_%s_%s %g\n", #wepname, #name, \
-               cvar(sprintf("g_balance_%s_%s", #wepname, #name)))) }
-
-#define WEP_CONFIG_WRITE_CVARS_PRI(wepname,name) WEP_CONFIG_WRITE_CVARS_NONE(wepname, primary_##name)
-#define WEP_CONFIG_WRITE_CVARS_SEC(wepname,name) WEP_CONFIG_WRITE_CVARS_NONE(wepname, secondary_##name)
-#define WEP_CONFIG_WRITE_CVARS_BOTH(wepname,name) \
-       WEP_CONFIG_WRITE_CVARS_PRI(wepname, name) \
-       WEP_CONFIG_WRITE_CVARS_SEC(wepname, name)
-
-#define WEP_CONFIG_WRITE_CVARS(wepid,wepname,mode,name) WEP_CONFIG_WRITE_CVARS_##mode(wepname, name)
-
-#define WEP_CONFIG_WRITE_PROPS_string(wepname,name) \
-       { WEP_CONFIG_QUEUE( \
+#define WEP_CONFIG_WRITE_PROPS_string(wepname, name) {\
+       W_Config_Queue( \
                sprintf("set g_balance_%s_%s \"%s\"\n", #wepname, #name, \
-               cvar_string(sprintf("g_balance_%s_%s", #wepname, #name)))) }
+               cvar_string(sprintf("g_balance_%s_%s", #wepname, #name)))); \
+}
 
-#define WEP_CONFIG_WRITE_PROPS_float(wepname,name) \
-       { WEP_CONFIG_QUEUE( \
+#define WEP_CONFIG_WRITE_PROPS_float(wepname, name) {\
+       W_Config_Queue( \
                sprintf("set g_balance_%s_%s %g\n", #wepname, #name, \
-               cvar(sprintf("g_balance_%s_%s", #wepname, #name)))) }
+               cvar(sprintf("g_balance_%s_%s", #wepname, #name)))); \
+}
 
-#define WEP_CONFIG_WRITE_PROPS(wepid,wepname,type,prop,name) WEP_CONFIG_WRITE_PROPS_##type(wepname,name)
 #endif