With my new macro powers, get rid of duplicate wep cvar declarations

diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc
index a28daff80fa9ea5e59e3c693f78179b89587e050..fe183e60612273480978c2311d699dcb25197196 100644 (file)
--- a/qcsrc/common/weapons/w_hagar.qc
+++ b/qcsrc/common/weapons/w_hagar.qc
@@ -17,7 +17,6 @@ REGISTER_WEAPON(
        WEP_ADD_CVAR(weapon, MO_BOTH, edgedamage) \
        WEP_ADD_CVAR(weapon, MO_BOTH, force) \
        WEP_ADD_CVAR(weapon, MO_BOTH, radius) \
-       WEP_ADD_CVAR(weapon, MO_BOTH, ammo) \
        WEP_ADD_CVAR(weapon, MO_BOTH, refire) \
        WEP_ADD_CVAR(weapon, MO_BOTH, speed) \
        WEP_ADD_CVAR(weapon, MO_BOTH, damageforcescale) \

diff --git a/qcsrc/common/weapons/w_nex.qc b/qcsrc/common/weapons/w_nex.qc
index f1a79805050709531e64c9172898eecee3760eac..dcabbc586a0804cda85989d6755731a5c347cdec 100644 (file)
--- a/qcsrc/common/weapons/w_nex.qc
+++ b/qcsrc/common/weapons/w_nex.qc
@@ -20,7 +20,6 @@ REGISTER_WEAPON(
        WEP_ADD_CVAR(weapon, MO_BOTH, damagefalloff_maxdist) \
        WEP_ADD_CVAR(weapon, MO_BOTH, damagefalloff_halflife) \
        WEP_ADD_CVAR(weapon, MO_BOTH, damagefalloff_forcehalflife) \
-       WEP_ADD_CVAR(weapon, MO_BOTH, ammo) \
        WEP_ADD_CVAR(weapon, MO_BOTH, refire) \
        WEP_ADD_CVAR(weapon, MO_NONE, charge) \
        WEP_ADD_CVAR(weapon, MO_NONE, charge_mindmg) \

diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh
index 9efdf0eab40cc9e681ec3675e3322c2c56b8442d..bfb1964dd99026b8f8b9388c97ea712326b38991 100644 (file)
--- a/qcsrc/common/weapons/weapons.qh
+++ b/qcsrc/common/weapons/weapons.qh
@@ -285,14 +285,14 @@ float WEP_LAST;
 
 #define WEP_ADD_CVAR(weapon,mode,name) \
        #if mode == MO_PRI \
-               WEP_DUPECHECK(WEP_CVAR_##weapon##_##name, autocvar_g_balance_##weapon##_primary_##name) \
+               WEP_DUPECHECK(WEP_CVAR_P_##weapon##_##name, autocvar_g_balance_##weapon##_primary_##name) \
        #endif \
        #if mode == MO_SEC \
-               WEP_DUPECHECK(WEP_CVAR_##weapon##_##name, autocvar_g_balance_##weapon##_secondary_##name) \
+               WEP_DUPECHECK(WEP_CVAR_S_##weapon##_##name, autocvar_g_balance_##weapon##_secondary_##name) \
        #endif \
        #if mode == MO_BOTH \
-               WEP_DUPECHECK(WEP_CVAR_##weapon##_##name, autocvar_g_balance_##weapon##_primary_##name) \
-               WEP_DUPECHECK(WEP_CVAR_##weapon##_##name, autocvar_g_balance_##weapon##_secondary_##name) \
+               WEP_DUPECHECK(WEP_CVAR_P_##weapon##_##name, autocvar_g_balance_##weapon##_primary_##name) \
+               WEP_DUPECHECK(WEP_CVAR_S_##weapon##_##name, autocvar_g_balance_##weapon##_secondary_##name) \
        #endif \
        #if mode == MO_NONE \
                WEP_DUPECHECK(WEP_CVAR_##weapon##_##name, autocvar_g_balance_##weapon##_##name) \