From 06943e2a72964e26b3dcaf52b842609bd724930c Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Fri, 20 May 2005 20:51:37 +0000 Subject: [PATCH] fixed rjumps with 0 self damage git-svn-id: svn://svn.icculus.org/nexuiz/trunk@412 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- qcsrc/gamec/g_damage.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qcsrc/gamec/g_damage.c b/qcsrc/gamec/g_damage.c index c797b7887..f29ec94a5 100644 --- a/qcsrc/gamec/g_damage.c +++ b/qcsrc/gamec/g_damage.c @@ -172,11 +172,13 @@ void RadiusDamage (entity inflictor, entity attacker, float coredamage, float ed if (power > 1) power = 1; finaldmg = coredamage * power + edgedamage * (1 - power); - force = normalize((m1 + m2) * 0.5 - blastorigin) * (finaldmg / coredamage) * forceintensity; - if (targ == attacker) - finaldmg = finaldmg * cvar("g_balance_selfdamagepercent"); // Partial damage if the attacker hits himself if (finaldmg > 0) + { + force = normalize((m1 + m2) * 0.5 - blastorigin) * (finaldmg / coredamage) * forceintensity; + if (targ == attacker) + finaldmg = finaldmg * cvar("g_balance_selfdamagepercent"); // Partial damage if the attacker hits himself Damage (targ, inflictor, attacker, finaldmg, deathtype, inflictor.origin, force); + } } } targ = targ.chain; -- 2.39.2