X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=360078d2a31124fde23eb212159440944d802649;hp=f95115a2ca465a8f8fbe01679da18eed973229a6;hb=64b8409b2d6fb93dc51ba24a82d219c8cd56a907;hpb=5bbfb59ff40eca7824c231d687c2bf587a01749d diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index f95115a2c..360078d2a 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -80,12 +80,12 @@ void RemoveGrapplingHook(entity pl) //pl.disableclientprediction = false; } -void GrapplingHookReset(void) -{SELFPARAM(); - if(self.realowner.hook == self) - RemoveGrapplingHook(self.owner); +void GrapplingHookReset(entity this) +{ + if(this.realowner.hook == this) + RemoveGrapplingHook(this.owner); else // in any case: - remove(self); + remove(this); } void GrapplingHookThink(); @@ -106,7 +106,7 @@ void GrapplingHook_Stop() .vector hook_start, hook_end; bool GrapplingHookSend(entity this, entity to, int sf) { - WriteByte(MSG_ENTITY, ENT_CLIENT_HOOK); + WriteHeader(MSG_ENTITY, ENT_CLIENT_HOOK); sf = sf & 0x7F; if(sound_allowed(MSG_BROADCAST, self.realowner)) sf |= 0x80; @@ -299,7 +299,7 @@ void GrapplingHookThink() } } -void GrapplingHookTouch (void) +void GrapplingHookTouch () {SELFPARAM(); if(other.movetype == MOVETYPE_FOLLOW) return; @@ -339,7 +339,7 @@ void GrapplingHook_Damage (entity inflictor, entity attacker, float damage, int } } -void FireGrapplingHook (void) +void FireGrapplingHook () {SELFPARAM(); entity missile; vector org;