From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 21 Jan 2011 19:51:20 +0000 (+0100)
Subject: fix damage handling when gibbing
X-Git-Tag: xonotic-v0.5.0~316^2~31
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e0c76a13de11a8e14284021a420c0908a8186507

fix damage handling when gibbing
---

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index ca0b2d4a16..7345ff7843 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -396,6 +396,10 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 	local float take, save, waves, sdelay, dh, da, j;
 	vector v;
 	float valid_damage_for_weaponstats;
+	float excess;
+
+	if((g_arena && numspawned < 2) || (g_ca && ca_players < required_ca_players) && !inWarmupStage)
+		return;
 
 	dh = max(self.health, 0);
 	da = max(self.armorvalue, 0);
@@ -438,9 +442,6 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 	else
 		Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, self, attacker);
 
-	if((g_arena && numspawned < 2) || (g_ca && ca_players < required_ca_players) && !inWarmupStage)
-		return;
-
 	if (!g_minstagib)
 	{
 		v = healtharmor_applydamage(self.armorvalue, autocvar_g_balance_armor_blockpercent, damage);
@@ -462,6 +463,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 	MUTATOR_CALLHOOK(PlayerDamage_SplitHealthArmor);
 	take = bound(0, damage_take, self.health);
 	save = bound(0, damage_save, self.armorvalue);
+	excess = max(0, damage - take - save);
 
 	if(sound_allowed(MSG_BROADCAST, attacker))
 	{
@@ -721,7 +723,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 		// set damage function to corpse damage
 		self.event_damage = PlayerCorpseDamage;
 		// call the corpse damage function just in case it wants to gib
-		self.event_damage(inflictor, attacker, 0, deathtype, hitloc, force);
+		self.event_damage(inflictor, attacker, excess, deathtype, hitloc, force);
 		// set up to fade out later
 		SUB_SetFade (self, time + 6 + random (), 1);