Add attacker parameter to PlayHitsound

diff --git a/qcsrc/common/turrets/turret/fusionreactor.qc b/qcsrc/common/turrets/turret/fusionreactor.qc
index cd7dbec72d34bc62fc573875d4244eb767694c55..47bff24f1a9e063661ab21e75eb5c14b528b1cd6 100644 (file)
--- 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"));
 /* 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));
 /* 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 d7e9b07c05279a5c26a7f67655d9039ca4339c1a..72904757af216e8d7e8789f9c83c66ba22cf104d 100644 (file)
--- 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;
 
                        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))
                                {
                        {
                                if(DIFF_TEAM(victim, attacker) && !STAT(FROZEN, victim))
                                {

diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh
index 1c0985723000b0a5580f54a090df46f0b2c17e85..83d39f8bb51100bae80a53746fdad9753d8a6d95 100644 (file)
--- 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) \
 /** 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);
 
     /**/
 MUTATOR_HOOKABLE(PlayHitsound, EV_PlayHitsound);
 

diff --git a/qcsrc/server/steerlib.qc b/qcsrc/server/steerlib.qc
index c69230d88fce5f09b5d277f13ae72a15c8c451e8..5312eb8140b06d1002e3c6471ec98238d8112622 100644 (file)
--- a/qcsrc/server/steerlib.qc
+++ b/qcsrc/server/steerlib.qc
@@ -7,10 +7,11 @@
 /**
     Uniform pull towards a point
 **/
 /**
     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);
 {
     return normalize(point - this.origin);

-}
+}*/

 
 /**
     Uniform push from a point
 
 /**
     Uniform push from a point

diff --git a/qcsrc/server/steerlib.qh b/qcsrc/server/steerlib.qh
index fa21610f042d29c794149cb2a28a0ec02a824569..4beb69f6328ba6c337d3b34e803104464e8a73d3 100644 (file)
--- 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_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);