Merge branch 'terencehill/minplayers_per_team' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / hagar.qh

diff --git a/qcsrc/common/weapons/weapon/hagar.qh b/qcsrc/common/weapons/weapon/hagar.qh
index c5661f1e66831df9576c1ebd0e1fa615aeb7f51f..0d0f11e8575774e8d2f939e2f9f394f1c8d49920 100644 (file)
--- a/qcsrc/common/weapons/weapon/hagar.qh
+++ b/qcsrc/common/weapons/weapon/hagar.qh
@@ -1,7 +1,8 @@
 #pragma once
 
 CLASS(Hagar, Weapon)
-/* ammotype  */ ATTRIB(Hagar, ammo_type, int, RESOURCE_ROCKETS);
+/* spawnfunc */ ATTRIB(Hagar, m_canonical_spawnfunc, string, "weapon_hagar");
+/* ammotype  */ ATTRIB(Hagar, ammo_type, int, RES_ROCKETS);
 /* impulse   */ ATTRIB(Hagar, impulse, int, 8);
 /* flags     */ ATTRIB(Hagar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Hagar, bot_pickupbasevalue, float, 6000);
@@ -57,6 +58,4 @@ CLASS(Hagar, Weapon)
 ENDCLASS(Hagar)
 REGISTER_WEAPON(HAGAR, hagar, NEW(Hagar));
 
-#ifdef SVQC
-spawnfunc(weapon_hagar);
-#endif
+SPAWNFUNC_WEAPON(weapon_hagar, WEP_HAGAR)