From: terencehill <piuntn@gmail.com>
Date: Sun, 25 Nov 2012 12:33:16 +0000 (+0100)
Subject: CA: Fix "WARNING: adding score to unknown player" console error when a player falls... 
X-Git-Tag: xonotic-v0.7.0~199^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9dc51058dc784dc07c014c0249ba4bfbaad0f4f5;p=xonotic%2Fxonotic-data.pk3dir.git

CA: Fix "WARNING: adding score to unknown player" console error when a player falls into the void. Also, since player points are given based on inflicted damage, give points for killing someone by pushing him into the void too
---

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 3e560bd24..6df997541 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -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);
diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index d2cc61db3..1e7d2815d 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -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