OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added FDARI*s damagetype fix

Browse source 
SVN r3533 (trunk)
This commit is contained in:
Christoph Oelckers 2012-04-07 15:29:47 +00:00
commit 26dbec2aae
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/info.cpp
View file

@ -562,7 +562,6 @@ DamageTypeDefinition *DamageTypeDefinition::Get(FName const type)
bool DamageTypeDefinition::IgnoreArmor(FName const type)
{
if (type == NAME_Drowning) return true;
DamageTypeDefinition *dtd = Get(type);
if (dtd) return dtd->NoArmor;
return false;
@ -609,12 +608,11 @@ int DamageTypeDefinition::ApplyMobjDamageFactor(int damage, FName const type, Dm
{
fixed_t const *pdf = factors->CheckKey(NAME_None);
DamageTypeDefinition *dtd = Get(type);
// Here we are looking for modifications to untyped damage
// If the calling actor defines untyped damage factor, that is contained in "pdf".
if (pdf) // normal damage available
{
DamageTypeDefinition *dtd = Get(type);
if (dtd)
{
if (dtd->ReplaceFactor) return FixedMul(damage, dtd->DefaultFactor); // use default instead of untyped factor
@ -622,6 +620,10 @@ int DamageTypeDefinition::ApplyMobjDamageFactor(int damage, FName const type, Dm
}
return FixedMul(damage, *pdf); // there was no default, so actor default is used
}
else if (dtd)
{
return FixedMul(damage, dtd->DefaultFactor); // implicit untyped factor 1.0 does not need to be applied/replaced explicitly
}
}
return damage;
}