From 5134c592b8e912ce0f05ff8f8a2f3c258f8924d6 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 21 Aug 2016 16:19:11 +1000 Subject: [PATCH] Add attacker parameter to PlayHitsound --- qcsrc/common/turrets/turret/fusionreactor.qc | 2 +- qcsrc/server/g_damage.qc | 2 +- qcsrc/server/mutators/events.qh | 1 + qcsrc/server/steerlib.qc | 5 +++-- qcsrc/server/steerlib.qh | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/qcsrc/common/turrets/turret/fusionreactor.qc b/qcsrc/common/turrets/turret/fusionreactor.qc index cd7dbec72d..47bff24f1a 100644 --- a/qcsrc/common/turrets/turret/fusionreactor.qc +++ b/qcsrc/common/turrets/turret/fusionreactor.qc @@ -8,7 +8,7 @@ CLASS(FusionReactor, Turret) /* modelname */ ATTRIB(FusionReactor, mdl, string, "base.md3"); /* model */ ATTRIB_STRZONE(FusionReactor, model, string, strcat("models/turrets/", this.mdl)); /* head_model */ ATTRIB_STRZONE(FusionReactor, head_model, string, strcat("models/turrets/", "reactor.md3")); -/* netname */ ATTRIB(FusionReactor, netname, string, "fusionreactor"); +/* netname */ ATTRIB(FusionReactor, netname, string, "fusreac"); /* fullname */ ATTRIB(FusionReactor, turret_name, string, _("Fusion Reactor")); ENDCLASS(FusionReactor) REGISTER_TURRET(FUSIONREACTOR, NEW(FusionReactor)); diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index d7e9b07c05..72904757af 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -788,7 +788,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d else victim = targ; - if(IS_PLAYER(victim) || (IS_TURRET(victim) && victim.active == ACTIVE_ACTIVE) || IS_MONSTER(victim) || MUTATOR_CALLHOOK(PlayHitsound, victim)) + if(IS_PLAYER(victim) || (IS_TURRET(victim) && victim.active == ACTIVE_ACTIVE) || IS_MONSTER(victim) || MUTATOR_CALLHOOK(PlayHitsound, victim, attacker)) { if(DIFF_TEAM(victim, attacker) && !STAT(FROZEN, victim)) { diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh index 1c09857230..83d39f8bb5 100644 --- a/qcsrc/server/mutators/events.qh +++ b/qcsrc/server/mutators/events.qh @@ -58,6 +58,7 @@ MUTATOR_HOOKABLE(PlayerDies, EV_PlayerDies); /** called when a player dies to e.g. remove stuff he was carrying */ #define EV_PlayHitsound(i, o) \ /** victim */ i(entity, MUTATOR_ARGV_0_entity) \ + /** attacker */ i(entity, MUTATOR_ARGV_1_entity) \ /**/ MUTATOR_HOOKABLE(PlayHitsound, EV_PlayHitsound); diff --git a/qcsrc/server/steerlib.qc b/qcsrc/server/steerlib.qc index c69230d88f..5312eb8140 100644 --- a/qcsrc/server/steerlib.qc +++ b/qcsrc/server/steerlib.qc @@ -7,10 +7,11 @@ /** Uniform pull towards a point **/ -vector steerlib_pull(entity this, vector point) +#define steerlib_pull(ent,point) normalize(point - (ent).origin) +/*vector steerlib_pull(entity this, vector point) { return normalize(point - this.origin); -} +}*/ /** Uniform push from a point diff --git a/qcsrc/server/steerlib.qh b/qcsrc/server/steerlib.qh index fa21610f04..4beb69f632 100644 --- a/qcsrc/server/steerlib.qh +++ b/qcsrc/server/steerlib.qh @@ -4,4 +4,4 @@ vector steerlib_arrive(entity this, vector point, float maximal_distance); vector steerlib_attract2(entity this, vector point, float min_influense, float max_distance, float max_influense); -vector steerlib_pull(entity this, vector point); +//vector steerlib_pull(entity this, vector point); -- 2.39.2