- fixed damage calculation for OLDRADIUSDMG case of P_RadiusAttack.

SVN r1937 (trunk)
This commit is contained in:
Christoph Oelckers 2009-10-25 23:12:00 +00:00
parent 7e2e62fd5c
commit 5ab4159e76

View file

@ -4328,7 +4328,7 @@ void P_RadiusAttack (AActor *bombspot, AActor *bombsource, int bombdamage, int b
if (P_CheckSight (thing, bombspot, 1)) if (P_CheckSight (thing, bombspot, 1))
{ // OK to damage; target is in direct path { // OK to damage; target is in direct path
dist = clamp<int>(dist - fulldamagedistance, 0, dist); dist = clamp<int>(dist - fulldamagedistance, 0, dist);
int damage = Scale (bombdamage, bombdistance-dist, bombdistance-fulldamagedistance); int damage = Scale (bombdamage, bombdistance-dist, bombdistance);
damage = (int)((float)damage * splashfactor); damage = (int)((float)damage * splashfactor);
damage = Scale(damage, thing->GetClass()->Meta.GetMetaFixed(AMETA_RDFactor, FRACUNIT), FRACUNIT); damage = Scale(damage, thing->GetClass()->Meta.GetMetaFixed(AMETA_RDFactor, FRACUNIT), FRACUNIT);