OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added selfdamagefactor actor property.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-27 11:22:51 +01:00
commit f9f9f2d5fc
5 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/p_interaction.cpp
View file

@ -1020,6 +1020,11 @@ static int DamageMobj (AActor *target, AActor *inflictor, AActor *source, int da
}
return 0;
}
if (target == source && damage < TELEFRAG_DAMAGE)
{
damage = int(damage * target->GetClass()->SelfDamageFactor);
}
// [MC] Changed it to check rawdamage here for consistency, even though that doesn't actually do anything
// different here. At any rate, invulnerable is being checked before type factoring, which is then being
// checked by player cheats/invul/buddha followed by monster buddha. This is inconsistent. Don't let the