Cleanup weapon settings macros some more

[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 a6cb64326d8a2da151d81b2f8f533144306a0bd0..9e21414ce608bbeb3b29967158e98f28b3fc2eeb 100644 (file)
--- a/qcsrc/common/weapons/config.qh
+++ b/qcsrc/common/weapons/config.qh
@@ -18,40 +18,33 @@ string wep_config_queue[MAX_WEP_CONFIG];
        fputs(wep_config_file, a); \
        if(wep_config_alsoprint) { print(a); } }
 
-#define WEP_CONFIG_WRITE_CVARS(weapon,mode,name) \
-       #if mode == MO_PRI \
-               { WEP_CONFIG_QUEUE( \
-                       sprintf("set g_balance_%s_primary_%s %g\n", #weapon, #name, \
-                       cvar(sprintf("g_balance_%s_primary_%s", #weapon, #name)))) } \
-       #endif \
-       #if mode == MO_SEC \
-               { WEP_CONFIG_QUEUE( \
-                       sprintf("set g_balance_%s_secondary_%s %g\n", #weapon, #name, \
-                       cvar(sprintf("g_balance_%s_secondary_%s", #weapon, #name)))) } \
-       #endif \
-       #if mode == MO_BOTH \
-               { WEP_CONFIG_QUEUE( \
-                       sprintf("set g_balance_%s_primary_%s %g\n", #weapon, #name, \
-                       cvar(sprintf("g_balance_%s_primary_%s", #weapon, #name)))) } \
-               { WEP_CONFIG_QUEUE( \
-                       sprintf("set g_balance_%s_secondary_%s %g\n", #weapon, #name, \
-                       cvar(sprintf("g_balance_%s_secondary_%s", #weapon, #name)))) } \
-       #endif \
-       #if mode == MO_NONE \
-               { WEP_CONFIG_QUEUE( \
-                       sprintf("set g_balance_%s_%s %g\n", #weapon, #name, \
-                       cvar(sprintf("g_balance_%s_%s", #weapon, #name)))) } \
-       #endif
+#define WEP_CONFIG_WRITE_CVARS_MO_PRI(wepname,name) \
+       { WEP_CONFIG_QUEUE( \
+               sprintf("set g_balance_%s_primary_%s %g\n", #wepname, #name, \
+               cvar(sprintf("g_balance_%s_primary_%s", #wepname, #name)))) }
+
+#define WEP_CONFIG_WRITE_CVARS_MO_SEC(wepname,name) \
+       { WEP_CONFIG_QUEUE( \
+               sprintf("set g_balance_%s_secondary_%s %g\n", #wepname, #name, \
+               cvar(sprintf("g_balance_%s_secondary_%s", #wepname, #name)))) }
+               
+#define WEP_CONFIG_WRITE_CVARS_MO_BOTH(wepname,name) \
+       { WEP_CONFIG_QUEUE( \
+               sprintf("set g_balance_%s_primary_%s %g\n", #wepname, #name, \
+               cvar(sprintf("g_balance_%s_primary_%s", #wepname, #name)))) } \
+       { WEP_CONFIG_QUEUE( \
+               sprintf("set g_balance_%s_secondary_%s %g\n", #wepname, #name, \
+               cvar(sprintf("g_balance_%s_secondary_%s", #wepname, #name)))) }
+
+#define WEP_CONFIG_WRITE_CVARS_MO_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(wepid,wepname,mode,name) WEP_CONFIG_WRITE_CVARS_##mode(wepname, name)
 
 // WEAPONTODO: remove prop
-#define WEP_CONFIG_WRITE_PROPS(weapon,name) \
-               { WEP_CONFIG_QUEUE( \
-                       sprintf("set g_balance_%s_%s %g\n", #weapon, #name, \
-                       cvar(sprintf("g_balance_%s_%s", #weapon, #name)))) }
-
-#define WEP_CONFIG_SETTINGS(wepsettings) \
-       #define WEP_ADD_CVAR(weapon,mode,name) WEP_CONFIG_WRITE_CVARS(weapon,mode,name) \
-       #define WEP_ADD_PROP(weapon,prop,name) WEP_CONFIG_WRITE_PROPS(weapon,name) \
-       wepsettings \
-       #undef WEP_ADD_CVAR \
-       #undef WEP_ADD_PROP
+#define WEP_CONFIG_WRITE_PROPS(wepid,wepname,mode,name) \
+       { WEP_CONFIG_QUEUE( \
+               sprintf("set g_balance_%s_%s %g\n", #wepname, #name, \
+               cvar(sprintf("g_balance_%s_%s", #wepname, #name)))) }