Blaster is no longer reloadable

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

diff --git a/qcsrc/common/weapons/w_minstanex.qc b/qcsrc/common/weapons/w_minstanex.qc
index 102c24b80632f62c9cc963c8152a37dbea382baa..433a5ee81ff3a6f4fb4a1d35829585cc9449f7ca 100644 (file)
--- a/qcsrc/common/weapons/w_minstanex.qc
+++ b/qcsrc/common/weapons/w_minstanex.qc
@@ -2,38 +2,39 @@
 REGISTER_WEAPON(
 /* WEP_##id */ MINSTANEX,
 /* function */ w_minstanex,
-/* ammotype */ IT_CELLS,
+/* ammotype */ ammo_cells,
 /* impulse  */ 7,
 /* flags    */ WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN,
 /* rating   */ BOT_PICKUP_RATING_HIGH,
 /* model    */ "minstanex",
 /* netname  */ "minstanex",
-/* fullname */ _("MinstaNex")
+/* fullname */ _("Vaporizer")
 );
 
-#define MINSTANEX_SETTINGS(w_cvar,w_prop) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_PRI, ammo) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_PRI, animtime) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_PRI, refire) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, ammo) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, animtime) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, damage) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, delay) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, edgedamage) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, force) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, lifetime) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, radius) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, refire) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, shotangle) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, speed) \
-       w_cvar(WEP_MINSTANEX, minstanex, MO_SEC, spread) \
-       w_prop(WEP_MINSTANEX, minstanex, float,  reloading_ammo, reload_ammo) \
-       w_prop(WEP_MINSTANEX, minstanex, float,  reloading_time, reload_time) \
-       w_prop(WEP_MINSTANEX, minstanex, float,  switchdelay_raise, switchdelay_raise) \
-       w_prop(WEP_MINSTANEX, minstanex, float,  switchdelay_drop, switchdelay_drop) \
-       w_prop(WEP_MINSTANEX, minstanex, string, weaponreplace, weaponreplace) \
-       w_prop(WEP_MINSTANEX, minstanex, float,  weaponstart, weaponstart) \
-       w_prop(WEP_MINSTANEX, minstanex, float,  weaponstartoverride, weaponstartoverride)
+#define MINSTANEX_SETTINGS(w_cvar,w_prop) MINSTANEX_SETTINGS_LIST(w_cvar, w_prop, MINSTANEX, minstanex)
+#define MINSTANEX_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
+       w_cvar(id, sn, MO_PRI, ammo) \
+       w_cvar(id, sn, MO_PRI, animtime) \
+       w_cvar(id, sn, MO_PRI, refire) \
+       w_cvar(id, sn, MO_SEC, ammo) \
+       w_cvar(id, sn, MO_SEC, animtime) \
+       w_cvar(id, sn, MO_SEC, damage) \
+       w_cvar(id, sn, MO_SEC, delay) \
+       w_cvar(id, sn, MO_SEC, edgedamage) \
+       w_cvar(id, sn, MO_SEC, force) \
+       w_cvar(id, sn, MO_SEC, lifetime) \
+       w_cvar(id, sn, MO_SEC, radius) \
+       w_cvar(id, sn, MO_SEC, refire) \
+       w_cvar(id, sn, MO_SEC, shotangle) \
+       w_cvar(id, sn, MO_SEC, speed) \
+       w_cvar(id, sn, MO_SEC, spread) \
+       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
 MINSTANEX_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)