Use cvar() for WR_CONFIG so that unused cvars are detected properly

diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh
index 4fa5080a47703eed71ed9806216072ea0dc7e6aa..a6cb64326d8a2da151d81b2f8f533144306a0bd0 100644 (file)
--- a/qcsrc/common/weapons/config.qh
+++ b/qcsrc/common/weapons/config.qh
@@ -25,34 +25,29 @@ string wep_config_queue[MAX_WEP_CONFIG];
                        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, \
-                       autocvar_g_balance_##weapon##_secondary_##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_BOTH \
-               { WEP_CONFIG_QUEUE(sprintf("set g_balance_%s_primary_%s %g\n", \
-                       #weapon, \
-                       #name, \
-                       autocvar_g_balance_##weapon##_primary_##name)) } \
-               { WEP_CONFIG_QUEUE(sprintf("set g_balance_%s_secondary_%s %g\n", \
-                       #weapon, \
-                       #name, \
-                       autocvar_g_balance_##weapon##_secondary_##name)) } \
+               { 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, \
-                       autocvar_g_balance_##weapon##_##name)) } \
+               { WEP_CONFIG_QUEUE( \
+                       sprintf("set g_balance_%s_%s %g\n", #weapon, #name, \
+                       cvar(sprintf("g_balance_%s_%s", #weapon, #name)))) } \
        #endif
 
 // WEAPONTODO: remove prop
 #define WEP_CONFIG_WRITE_PROPS(weapon,name) \
-       { WEP_CONFIG_QUEUE(sprintf("set g_balance_%s_%s %g\n", \
-                       #weapon, \
-                       #name, \
-                       autocvar_g_balance_##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) \

diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc
index f14b8cd130bc1b8bbb5c024dec76a6777d7bef4a..d3497bb7cb4580f897aae8e0a0a495739d740223 100644 (file)
--- a/qcsrc/common/weapons/w_devastator.qc
+++ b/qcsrc/common/weapons/w_devastator.qc
@@ -35,7 +35,6 @@ REGISTER_WEAPON(
        WEP_ADD_CVAR(weapon, MO_NONE, speed) \
        WEP_ADD_CVAR(weapon, MO_NONE, speedaccel) \
        WEP_ADD_CVAR(weapon, MO_NONE, speedstart) \
-       WEP_ADD_CVAR(weapon, MO_NONE, foobarsdfsd) \
        WEP_ADD_PROP(weapon, reloading_ammo, reload_ammo) \
        WEP_ADD_PROP(weapon, reloading_time, reload_time) \
        WEP_ADD_PROP(weapon, switchdelay_raise, switchdelay_raise) \