Merge remote branch 'origin/master' into fruitiex/gamemode_freezetag

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

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index c3e56a3d044085f4fd1ed6a5cf8cff2b8d2f42f9..7af3a866ab5bb9006ae0db717ebdad98b7a414f9 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -120,12 +120,14 @@ void GiveFrags (entity attacker, entity targ, float f)
                {
                        // teamkill
                        PlayerScore_Add(attacker, SP_KILLS, -1); // or maybe add a teamkills field?
                {
                        // teamkill
                        PlayerScore_Add(attacker, SP_KILLS, -1); // or maybe add a teamkills field?

+                       PlayerStats_Event(attacker, PLAYERSTATS_KILLS, -1);

                }
        }
        else
        {
                // regular frag
                PlayerScore_Add(attacker, SP_KILLS, 1);
                }
        }
        else
        {
                // regular frag
                PlayerScore_Add(attacker, SP_KILLS, 1);

+               PlayerStats_Event(attacker, PLAYERSTATS_KILLS, 1);

        }
 
        PlayerScore_Add(targ, SP_DEATHS, 1);
        }
 
        PlayerScore_Add(targ, SP_DEATHS, 1);


@@ -528,7 +530,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 
                if(g_freezetag)
                {
 
                if(g_freezetag)
                {

-                       if(targ.freezetag_frozen == 1 && deathtype != DEATH_KILL) // we still need teamchange to actually kill
+                       if(targ.freezetag_frozen == 1)

                        {
                                damage = 0;
                                force = force * cvar("g_freezetag_frozen_force");
                        {
                                damage = 0;
                                force = force * cvar("g_freezetag_frozen_force");