X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_minstanex.qc;h=433a5ee81ff3a6f4fb4a1d35829585cc9449f7ca;hb=bd0f8ad3384993fdb366309e037a7f10ef13f160;hp=d9e3cd15811f72a4b407ddc27e849bec4e56bd2a;hpb=7c734de31c85ae5fe1028b9a0c358f1c53fa7351;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/w_minstanex.qc b/qcsrc/common/weapons/w_minstanex.qc
index d9e3cd158..433a5ee81 100644
--- a/qcsrc/common/weapons/w_minstanex.qc
+++ b/qcsrc/common/weapons/w_minstanex.qc
@@ -2,35 +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, reloading_ammo, reload_ammo) \
-	w_prop(WEP_MINSTANEX, minstanex, reloading_time, reload_time) \
-	w_prop(WEP_MINSTANEX, minstanex, switchdelay_raise, switchdelay_raise) \
-	w_prop(WEP_MINSTANEX, minstanex, switchdelay_drop, switchdelay_drop)
+#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)