]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
CA: Fix "WARNING: adding score to unknown player" console error when a player falls...
authorterencehill <piuntn@gmail.com>
Sun, 25 Nov 2012 12:33:16 +0000 (13:33 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 25 Nov 2012 12:33:16 +0000 (13:33 +0100)
qcsrc/server/cl_player.qc
qcsrc/server/g_damage.qc

index 3e560bd2452a71020d339d7ed22830a76b212ec8..6df997541719d096fd8ab75031fef74cee330057 100644 (file)
@@ -604,6 +604,9 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
                self.istypefrag = 0;
        }
 
+       if(g_ca && self != attacker && attacker.classname == "player")
+               PlayerScore_Add(attacker, SP_SCORE, (damage - excess) * autocvar_g_ca_damage2score_multiplier);
+
        float abot, vbot, awep;
        abot = (clienttype(attacker) == CLIENTTYPE_BOT);
        vbot = (clienttype(self) == CLIENTTYPE_BOT);
index d2cc61db3346cb3405ca086e9d025657fd2a4c6f..1e7d2815d501af4bc8bb9d1df2177e7b13bbbcdb 100644 (file)
@@ -854,8 +854,6 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                                                        if(deathtype & HITTYPE_HEADSHOT)
                                                                headshot = 1;
                                                }
-                                               if(g_ca)
-                                                       PlayerScore_Add(attacker, SP_SCORE, damage * autocvar_g_ca_damage2score_multiplier);
                                        }
                                }
                                else