From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 4 Jan 2012 14:15:32 +0000 (+0200)
Subject: Use the correct damage value in damage effects. Edge damage will now be accounted... 
X-Git-Tag: xonotic-v0.6.0~110^2^2~76
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eab34d0a1c791c5b2a9f061d877e1a7fdf579542;p=xonotic%2Fxonotic-data.pk3dir.git

Use the correct damage value in damage effects. Edge damage will now be accounted, and damage particles will last based on the damage actually dealt
---

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index b6390e631..495652cce 100644
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -73,7 +73,7 @@ void Ent_DamageInfo(float isNew)
 		if(self.event_damage)
 			self.event_damage(thisdmg, w_deathtype, w_org, thisforce);
 
-		DamageEffect(dmg, w_deathtype, species, self.entnum - 1);
+		DamageEffect(thisdmg, w_deathtype, species, self.entnum - 1);
 	}
 
 	self = oldself;