OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: Armor did not use damagefactor "Normal" as a fallback factor.

Browse source 
SVN r3469 (trunk)
This commit is contained in:
Randy Heit 2012-03-23 01:20:45 +00:00
commit 9fcc6ebc89
5 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/p_interaction.cpp
View file

@ -1000,8 +1000,7 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
DmgFactors *df = target->GetClass()->ActorInfo->DamageFactors;
if (df != NULL)
{
fixed_t *pdf = df->CheckKey(mod);
if (pdf== NULL && mod != NAME_None) pdf = df->CheckKey(NAME_None);
fixed_t *pdf = df->CheckFactor(mod);
if (pdf != NULL)
{
damage = FixedMul(damage, *pdf);