From: Samual Lenks <samual@xonotic.org>
Date: Sun, 30 Jun 2013 23:06:55 +0000 (-0400)
Subject: With my new macro powers, get rid of duplicate wep cvar declarations
X-Git-Tag: xonotic-v0.8.0~152^2~356
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e9f44a08653319d7280067fdfe775863023aeece;p=xonotic%2Fxonotic-data.pk3dir.git

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 a28daff80..fe183e606 100644
--- 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 f1a798050..dcabbc586 100644
--- 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 9efdf0eab..bfb1964dd 100644
--- 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) \