X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fhook.qh;h=bff975e005479ce5d12eaf5751ec11b6b06843f2;hp=4988323fda187803dab6218b45002d4bede7bf90;hb=e0012447bfce1b551df3dc01b043655aa93dafad;hpb=7ff985ed6aa644a01d2520ec06603f32f9dd4074 diff --git a/qcsrc/common/weapons/weapon/hook.qh b/qcsrc/common/weapons/weapon/hook.qh index 4988323fd..bff975e00 100644 --- a/qcsrc/common/weapons/weapon/hook.qh +++ b/qcsrc/common/weapons/weapon/hook.qh @@ -1,9 +1,10 @@ #pragma once CLASS(Hook, Weapon) -/* ammotype */ ATTRIB(Hook, ammo_type, int, RESOURCE_FUEL); +/* spawnfunc */ ATTRIB(Hook, m_canonical_spawnfunc, string, "weapon_hook"); +/* ammotype */ ATTRIB(Hook, ammo_type, int, RES_FUEL); /* impulse */ ATTRIB(Hook, impulse, int, 0); -/* flags */ ATTRIB(Hook, spawnflags, int, WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); +/* flags */ ATTRIB(Hook, spawnflags, int, WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(Hook, bot_pickupbasevalue, float, 0); /* color */ ATTRIB(Hook, wpcolor, vector, '0 0.5 0'); /* modelname */ ATTRIB(Hook, mdl, string, "hookgun"); @@ -49,6 +50,8 @@ CLASS(Hook, Weapon) ENDCLASS(Hook) REGISTER_WEAPON(HOOK, hook, NEW(Hook)); +SPAWNFUNC_WEAPON(weapon_hook, WEP_HOOK) + CLASS(OffhandHook, OffhandWeapon) #ifdef SVQC METHOD(OffhandHook, offhand_think, void(OffhandHook this, entity actor, bool key_pressed)) @@ -59,7 +62,8 @@ CLASS(OffhandHook, OffhandWeapon) } #endif ENDCLASS(OffhandHook) -OffhandHook OFFHAND_HOOK; STATIC_INIT(OFFHAND_HOOK) { OFFHAND_HOOK = NEW(OffhandHook); } +OffhandHook OFFHAND_HOOK; +STATIC_INIT(OFFHAND_HOOK) { OFFHAND_HOOK = NEW(OffhandHook); } #ifdef SVQC