Merge remote branch 'origin/master' into samual/mutator_ctf

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_player.qc

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 49b52555f6ebb0734b8ee371a3b33f08b5cf8466..cd7188b0a571aca501fdff6dfa7c5bac1729ed41 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -697,12 +697,13 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 
                if(self.flagcarried)
                {
+                       // FIXCTF
                        if(attacker.classname != "player")
-                               DropFlag(self.flagcarried, self, attacker); // penalty for flag loss by suicide
+                               ctf_Handle_Drop(self); // penalty for flag loss by suicide
                        else if(attacker.team == self.team)
-                               DropFlag(self.flagcarried, attacker, attacker); // penalty for flag loss by suicide/teamkill
+                               ctf_Handle_Drop(self); // penalty for flag loss by suicide/teamkill
                        else
-                               DropFlag(self.flagcarried, world, attacker);
+                               ctf_Handle_Drop(self);
                }
                if(self.ballcarried && g_nexball)
                        DropBall(self.ballcarried, self.origin, self.velocity);