X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=04766c155dd89ed8cbbfc862f423217c8d6994fe;hb=92c61bba87835a1bfd152c4cbb40764647a83656;hp=f95115a2ca465a8f8fbe01679da18eed973229a6;hpb=9dd43f196ca7bc0979f94a0fb0f87cdd82a951c7;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index f95115a2c..04766c155 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -8,6 +8,8 @@ #include "cl_player.qh" #include "command/common.qh" #include "round_handler.qh" +#include "../common/state.qh" +#include "../common/physics/player.qh" #include "../common/vehicles/all.qh" #include "../common/constants.qh" #include "../common/util.qh" @@ -80,60 +82,60 @@ 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(); -void GrapplingHook_Stop() -{SELFPARAM(); - Send_Effect(EFFECT_HOOK_IMPACT, self.origin, '0 0 0', 1); - sound (self, CH_SHOTS, SND_HOOK_IMPACT, VOL_BASE, ATTEN_NORM); - - self.state = 1; - self.think = GrapplingHookThink; - self.nextthink = time; - self.touch = func_null; - self.velocity = '0 0 0'; - self.movetype = MOVETYPE_NONE; - self.hook_length = -1; +void GrapplingHookThink(entity this); +void GrapplingHook_Stop(entity this) +{ + Send_Effect(EFFECT_HOOK_IMPACT, this.origin, '0 0 0', 1); + sound (this, CH_SHOTS, SND_HOOK_IMPACT, VOL_BASE, ATTEN_NORM); + + this.state = 1; + setthink(this, GrapplingHookThink); + this.nextthink = time; + settouch(this, func_null); + this.velocity = '0 0 0'; + this.movetype = MOVETYPE_NONE; + this.hook_length = -1; } .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)) + if(sound_allowed(MSG_BROADCAST, this.realowner)) sf |= 0x80; WriteByte(MSG_ENTITY, sf); if(sf & 1) { - WriteByte(MSG_ENTITY, num_for_edict(self.realowner)); + WriteByte(MSG_ENTITY, etof(this.realowner)); } if(sf & 2) { - WriteCoord(MSG_ENTITY, self.hook_start.x); - WriteCoord(MSG_ENTITY, self.hook_start.y); - WriteCoord(MSG_ENTITY, self.hook_start.z); + WriteCoord(MSG_ENTITY, this.hook_start.x); + WriteCoord(MSG_ENTITY, this.hook_start.y); + WriteCoord(MSG_ENTITY, this.hook_start.z); } if(sf & 4) { - WriteCoord(MSG_ENTITY, self.hook_end.x); - WriteCoord(MSG_ENTITY, self.hook_end.y); - WriteCoord(MSG_ENTITY, self.hook_end.z); + WriteCoord(MSG_ENTITY, this.hook_end.x); + WriteCoord(MSG_ENTITY, this.hook_end.y); + WriteCoord(MSG_ENTITY, this.hook_end.z); } return true; } int autocvar_g_grappling_hook_tarzan; -void GrapplingHookThink() -{SELFPARAM(); +void GrapplingHookThink(entity this) +{ float spd, dist, minlength, pullspeed, ropestretch, ropeairfriction, rubberforce, newlength, rubberforce_overstretch; vector dir, org, end, v0, dv, v, myorg, vs; if(self.realowner.hook != self) // how did that happen? @@ -165,9 +167,9 @@ void GrapplingHookThink() entity pull_entity = self.realowner; float velocity_multiplier = 1; MUTATOR_CALLHOOK(GrappleHookThink, self, tarzan, pull_entity, velocity_multiplier); - tarzan = hook_tarzan; - pull_entity = hook_pullentity; - velocity_multiplier = hook_velmultiplier; + tarzan = M_ARGV(1, int); + pull_entity = M_ARGV(2, entity); + velocity_multiplier = M_ARGV(3, float); if(self.state == 1) { @@ -240,10 +242,10 @@ void GrapplingHookThink() { entity aim_ent = ((IS_VEHICLE(self.aiment) && self.aiment.owner) ? self.aiment.owner : self.aiment); v = v - dv * 0.5; - if((frozen_pulling && self.aiment.frozen) || !frozen_pulling) + if((frozen_pulling && STAT(FROZEN, self.aiment)) || !frozen_pulling) { self.aiment.velocity = self.aiment.velocity - dv * 0.5; - self.aiment.flags &= ~FL_ONGROUND; + UNSET_ONGROUND(self.aiment); if(self.aiment.flags & FL_PROJECTILE) UpdateCSQCProjectile(self.aiment); } @@ -251,17 +253,17 @@ void GrapplingHookThink() self.aiment.nextthink = time + autocvar_g_balance_grapplehook_nade_time; // set time after letting go? aim_ent.pusher = self.realowner; aim_ent.pushltime = time + autocvar_g_maxpushtime; - aim_ent.istypefrag = aim_ent.BUTTON_CHAT; + aim_ent.istypefrag = PHYS_INPUT_BUTTON_CHAT(aim_ent); } } - pull_entity.flags &= ~FL_ONGROUND; + UNSET_ONGROUND(pull_entity); } if(!frozen_pulling && !(self.aiment.flags & FL_PROJECTILE)) pull_entity.velocity = WarpZone_RefSys_TransformVelocity(self, pull_entity, v * velocity_multiplier); - if(frozen_pulling && autocvar_g_balance_grapplehook_pull_frozen == 2 && !self.aiment.frozen) + if(frozen_pulling && autocvar_g_balance_grapplehook_pull_frozen == 2 && !STAT(FROZEN, self.aiment)) { RemoveGrapplingHook(self.realowner); return; @@ -280,7 +282,7 @@ void GrapplingHookThink() self.realowner.velocity = dir*spd; self.realowner.movetype = MOVETYPE_FLY; - self.realowner.flags &= ~FL_ONGROUND; + UNSET_ONGROUND(self.realowner); } } @@ -299,13 +301,13 @@ void GrapplingHookThink() } } -void GrapplingHookTouch (void) -{SELFPARAM(); +void GrapplingHookTouch (entity this) +{ if(other.movetype == MOVETYPE_FOLLOW) return; - PROJECTILE_TOUCH; + PROJECTILE_TOUCH(this); - GrapplingHook_Stop(); + GrapplingHook_Stop(this); if(other) if(other.movetype != MOVETYPE_NONE) @@ -317,54 +319,54 @@ void GrapplingHookTouch (void) //self.realowner.disableclientprediction = true; } -void GrapplingHook_Damage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) -{SELFPARAM(); - if(self.health <= 0) +void GrapplingHook_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) +{ + if(this.health <= 0) return; - if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, -1)) // no exceptions + if (!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, -1)) // no exceptions return; // g_balance_projectiledamage says to halt - self.health = self.health - damage; + this.health = this.health - damage; - if (self.health <= 0) + if (this.health <= 0) { - if(attacker != self.realowner) + if(attacker != this.realowner) { - self.realowner.pusher = attacker; - self.realowner.pushltime = time + autocvar_g_maxpushtime; - self.realowner.istypefrag = self.realowner.BUTTON_CHAT; + this.realowner.pusher = attacker; + this.realowner.pushltime = time + autocvar_g_maxpushtime; + this.realowner.istypefrag = PHYS_INPUT_BUTTON_CHAT(this.realowner); } - RemoveGrapplingHook(self.realowner); + RemoveGrapplingHook(this.realowner); } } -void FireGrapplingHook (void) -{SELFPARAM(); +void FireGrapplingHook(entity actor) +{ entity missile; vector org; vector vs; - if(forbidWeaponUse(self)) return; - if(self.vehicle) return; + if(forbidWeaponUse(actor)) return; + if(actor.vehicle) return; - makevectors(self.v_angle); + makevectors(actor.v_angle); - int s = W_GetGunAlignment(self); + int s = W_GetGunAlignment(actor); vs = hook_shotorigin[s]; // UGLY WORKAROUND: play this on CH_WEAPON_B so it can't cut off fire sounds - sound (self, CH_WEAPON_B, SND_HOOK_FIRE, VOL_BASE, ATTEN_NORM); - org = self.origin + self.view_ofs + v_forward * vs.x + v_right * -vs.y + v_up * vs.z; + sound (actor, CH_WEAPON_B, SND_HOOK_FIRE, VOL_BASE, ATTEN_NORM); + org = actor.origin + actor.view_ofs + v_forward * vs.x + v_right * -vs.y + v_up * vs.z; - tracebox(self.origin + self.view_ofs, '-3 -3 -3', '3 3 3', org, MOVE_NORMAL, self); + tracebox(actor.origin + actor.view_ofs, '-3 -3 -3', '3 3 3', org, MOVE_NORMAL, actor); org = trace_endpos; Send_Effect(EFFECT_HOOK_MUZZLEFLASH, org, '0 0 0', 1); - missile = WarpZone_RefSys_SpawnSameRefSys(self); - missile.owner = missile.realowner = self; - self.hook = missile; + missile = WarpZone_RefSys_SpawnSameRefSys(actor); + missile.owner = missile.realowner = actor; + actor.hook = missile; missile.reset = GrapplingHookReset; missile.classname = "grapplinghook"; missile.flags = FL_PROJECTILE; @@ -383,8 +385,8 @@ void FireGrapplingHook (void) missile.angles = vectoangles (missile.velocity); //missile.glow_color = 250; // 244, 250 //missile.glow_size = 120; - missile.touch = GrapplingHookTouch; - missile.think = GrapplingHookThink; + settouch(missile, GrapplingHookTouch); + setthink(missile, GrapplingHookThink); missile.nextthink = time; missile.effects = /*EF_FULLBRIGHT | EF_ADDITIVE |*/ EF_LOWPRECISION; @@ -419,11 +421,3 @@ void GrappleHookInit() hook_shotorigin[3] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK.m_id), false, false, 4); } } - -void SetGrappleHookBindings() -{SELFPARAM(); - // this function has been modified for Xonotic - // don't remove these lines! old server or demos coud overwrite the new aliases - stuffcmd(self, "alias +hook +button6\n"); - stuffcmd(self, "alias -hook -button6\n"); -}