OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Make APoisonCloud::DoSpecialDamage() and P_PoisonDamage() respect damage factors.

Browse source 
- Pass the damage type to AActor::DoSpecialDamage().

SVN r3717 (trunk)
This commit is contained in:
Randy Heit 2012-06-29 04:21:31 +00:00
commit e1641da881
16 changed files with 61 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/p_interaction.cpp
View file

@ -991,7 +991,7 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
}
}
damage = inflictor->DoSpecialDamage (target, damage);
damage = inflictor->DoSpecialDamage (target, damage, mod);
if (damage == -1)
{
return;
@ -1566,6 +1566,19 @@ void P_PoisonDamage (player_t *player, AActor *source, int damage,
// Take half damage in trainer mode
damage = FixedMul(damage, G_SkillProperty(SKILLP_DamageFactor));
}
// Modify with damage factors
if (damage > 0)
{
damage = FixedMul(damage, target->DamageFactor);
if (damage > 0)
{
damage = DamageTypeDefinition::ApplyMobjDamageFactor(damage, player->poisontype, target->GetClass()->ActorInfo->DamageFactors);
}
if (damage <= 0)
{ // Damage was reduced to 0, so don't bother further.
return;
}
}
if (damage >= player->health
&& (G_SkillProperty(SKILLP_AutoUseHealth) || deathmatch)
&& !player->morphTics)