X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fvaporizer.qh;h=f87a800a921aeeba42b06d248cbb16e303559472;hp=f0b144341d538d1f24d39f47a43990b4e1be5e98;hb=70ea43b4278e37fb741f01832c447de8eb707c3e;hpb=5149aaa004721dba4947df89026a1c4b59506122

diff --git a/qcsrc/common/weapons/weapon/vaporizer.qh b/qcsrc/common/weapons/weapon/vaporizer.qh
index f0b144341d..f87a800a92 100644
--- a/qcsrc/common/weapons/weapon/vaporizer.qh
+++ b/qcsrc/common/weapons/weapon/vaporizer.qh
@@ -1,7 +1,8 @@
 #pragma once
 
 CLASS(Vaporizer, Weapon)
-/* ammotype  */ ATTRIB(Vaporizer, ammo_field, .int, ammo_cells);
+/* spawnfunc */ ATTRIB(Vaporizer, m_canonical_spawnfunc, string, "weapon_vaporizer");
+/* ammotype  */ ATTRIB(Vaporizer, ammo_type, int, RES_CELLS);
 /* impulse   */ ATTRIB(Vaporizer, impulse, int, 7);
 /* flags     */ ATTRIB(Vaporizer, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN | WEP_FLAG_NODUAL);
 /* rating    */ ATTRIB(Vaporizer, bot_pickupbasevalue, float, 10000);
@@ -21,7 +22,8 @@ CLASS(Vaporizer, Weapon)
 	BEGIN(class) \
 		P(class, prefix, ammo, float, PRI) \
     	P(class, prefix, animtime, float, PRI) \
-    	P(class, prefix, damage, float, PRI) \
+        P(class, prefix, damage, float, PRI) \
+    	P(class, prefix, force, float, PRI) \
     	P(class, prefix, refire, float, PRI) \
     	P(class, prefix, ammo, float, SEC) \
     	P(class, prefix, animtime, float, SEC) \
@@ -29,6 +31,7 @@ CLASS(Vaporizer, Weapon)
     	P(class, prefix, delay, float, SEC) \
     	P(class, prefix, edgedamage, float, SEC) \
     	P(class, prefix, force, float, SEC) \
+        P(class, prefix, force_zscale, float, SEC) \
     	P(class, prefix, lifetime, float, SEC) \
     	P(class, prefix, radius, float, SEC) \
     	P(class, prefix, refire, float, SEC) \
@@ -50,6 +53,8 @@ CLASS(Vaporizer, Weapon)
 ENDCLASS(Vaporizer)
 REGISTER_WEAPON(VAPORIZER, vaporizer, NEW(Vaporizer));
 
+SPAWNFUNC_WEAPON(weapon_vaporizer, WEP_VAPORIZER)
+SPAWNFUNC_WEAPON(weapon_minstanex, WEP_VAPORIZER)
 
 #ifdef SVQC
 .float vaporizer_lasthit;