for convenience, also set the redundant frag_ vars (fixes a bug in keyhunt)

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index d5064bdbdc5a5324f117135b96b2d341e08a672f..47b7ac069587e036ff5e583f15b55d43309f8814 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -636,6 +636,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 
                frag_attacker = attacker;
                frag_inflictor = inflictor;
+               frag_target = self;
                MUTATOR_CALLHOOK(PlayerDies);
 
                if(self.flagcarried)

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 338204c0c3a2cf30ba72cd7fff44b64b0e9d9c2d..0c446484d2a21d753aa8a7f4a744da7cbd529620 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -149,6 +149,7 @@ void GiveFrags (entity attacker, entity targ, float f)
        entity oldself;
        oldself = self;
        self = attacker;
+       frag_attacker = attacker;
        frag_target = targ;
        frag_score = f;
        if(MUTATOR_CALLHOOK(GiveFragsForKill))

diff --git a/qcsrc/server/mutators/base.qh b/qcsrc/server/mutators/base.qh
index 9ed316ee1574a00bdbfe517894c6c2c259e86be6..73c16a9cd01c371a05d151d24499c82bf660faa8 100644 (file)
--- a/qcsrc/server/mutators/base.qh
+++ b/qcsrc/server/mutators/base.qh
@@ -51,10 +51,12 @@ MUTATOR_HOOKABLE(PlayerDies);
        // INPUT:
                entity frag_inflictor;
                entity frag_attacker;
+               entity frag_target; // same as self
 
 MUTATOR_HOOKABLE(GiveFragsForKill);
        // called when someone was fragged by "self", and is expected to change frag_score to adjust scoring for the kill
        // INPUT:
+               entity frag_attacker; // same as self
                entity frag_target;
        // INPUT, OUTPUT:
                float frag_score;

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 97b78ca7978a22e058ef4598f57c9c8b7b682340..59480ab656db12c789baf9852b8a52ad5e41f4d8 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -324,7 +324,8 @@ float PlayerScore_Add(entity player, float scorefield, float score)
        {
                if(gameover)
                        return 0;
-               error("Adding score to unknown player!");
+               backtrace("Adding score to unknown player!");
+               return 0;
        }
        if(score)
                if(scores_label[scorefield] != "")