Don't do the full WEP_id for these, not necessary

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / w_rifle.qc

diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc
index 96f755183ca5040a0983bfb1adb61598244c3b4e..4248747687b86da5632869f3e7344786ed4bc806 100644 (file)
--- a/qcsrc/common/weapons/w_rifle.qc
+++ b/qcsrc/common/weapons/w_rifle.qc
@@ -11,27 +11,31 @@ REGISTER_WEAPON(
 /* fullname */ _("Rifle")
 );
 
-#define RIFLE_SETTINGS(w_cvar,w_prop) \
-       w_cvar(WEP_RIFLE, rifle, MO_BOTH, ammo) \
-       w_cvar(WEP_RIFLE, rifle, MO_BOTH, animtime) \
-       w_cvar(WEP_RIFLE, rifle, MO_BOTH, bulletconstant) \
-       w_cvar(WEP_RIFLE, rifle, MO_BOTH, bullethail) \
-       w_cvar(WEP_RIFLE, rifle, MO_BOTH, burstcost) \
-       w_cvar(WEP_RIFLE, rifle, MO_BOTH, damage) \
-       w_cvar(WEP_RIFLE, rifle, MO_BOTH, force) \
-       w_cvar(WEP_RIFLE, rifle, MO_BOTH, lifetime) \
-       w_cvar(WEP_RIFLE, rifle, MO_BOTH, refire) \
-       w_cvar(WEP_RIFLE, rifle, MO_BOTH, shots) \
-       w_cvar(WEP_RIFLE, rifle, MO_BOTH, speed) \
-       w_cvar(WEP_RIFLE, rifle, MO_BOTH, spread) \
-       w_cvar(WEP_RIFLE, rifle, MO_BOTH, tracer) \
-       w_cvar(WEP_RIFLE, rifle, MO_NONE, bursttime) \
-       w_cvar(WEP_RIFLE, rifle, MO_NONE, secondary) \
-       w_cvar(WEP_RIFLE, rifle, MO_SEC,  reload) \
-       w_prop(WEP_RIFLE, rifle, reloading_ammo, reload_ammo) \
-       w_prop(WEP_RIFLE, rifle, reloading_time, reload_time) \
-       w_prop(WEP_RIFLE, rifle, switchdelay_raise, switchdelay_raise) \
-       w_prop(WEP_RIFLE, rifle, switchdelay_drop, switchdelay_drop)
+#define RIFLE_SETTINGS(w_cvar,w_prop) RIFLE_SETTINGS_LIST(w_cvar, w_prop, RIFLE, rifle)
+#define RIFLE_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
+       w_cvar(id, sn, MO_BOTH, ammo) \
+       w_cvar(id, sn, MO_BOTH, animtime) \
+       w_cvar(id, sn, MO_BOTH, bulletconstant) \
+       w_cvar(id, sn, MO_BOTH, bullethail) \
+       w_cvar(id, sn, MO_BOTH, burstcost) \
+       w_cvar(id, sn, MO_BOTH, damage) \
+       w_cvar(id, sn, MO_BOTH, force) \
+       w_cvar(id, sn, MO_BOTH, lifetime) \
+       w_cvar(id, sn, MO_BOTH, refire) \
+       w_cvar(id, sn, MO_BOTH, shots) \
+       w_cvar(id, sn, MO_BOTH, speed) \
+       w_cvar(id, sn, MO_BOTH, spread) \
+       w_cvar(id, sn, MO_BOTH, tracer) \
+       w_cvar(id, sn, MO_NONE, bursttime) \
+       w_cvar(id, sn, MO_NONE, secondary) \
+       w_cvar(id, sn, MO_SEC,  reload) \
+       w_prop(id, sn, float,  reloading_ammo, reload_ammo) \
+       w_prop(id, sn, float,  reloading_time, reload_time) \
+       w_prop(id, sn, float,  switchdelay_raise, switchdelay_raise) \
+       w_prop(id, sn, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(id, sn, string, weaponreplace, weaponreplace) \
+       w_prop(id, sn, float,  weaponstart, weaponstart) \
+       w_prop(id, sn, float,  weaponstartoverride, weaponstartoverride)
 
 #ifdef SVQC
 RIFLE_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)