Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-08 03:28:15 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 32

Hit indicator for absorb/damage health effect

Browse source
This commit is contained in:
MiroslavR 2014-10-12 01:15:40 +02:00
parent 8dd95fd77e
commit ad253059b1
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwmechanics/actors.cpp
View file

@ -585,6 +585,12 @@ namespace MWMechanics
} }
} }
bool receivedMagicDamage = false;
if (creatureStats.getMagicEffects().get(ESM::MagicEffect::DamageHealth).getMagnitude() > 0.0f
|| creatureStats.getMagicEffects().get(ESM::MagicEffect::AbsorbHealth).getMagnitude() > 0.0f)
receivedMagicDamage = true;
// Apply damage ticks // Apply damage ticks
int damageEffects[] = { int damageEffects[] = {
ESM::MagicEffect::FireDamage, ESM::MagicEffect::ShockDamage, ESM::MagicEffect::FrostDamage, ESM::MagicEffect::Poison, ESM::MagicEffect::FireDamage, ESM::MagicEffect::ShockDamage, ESM::MagicEffect::FrostDamage, ESM::MagicEffect::Poison,
@ -592,7 +598,6 @@ namespace MWMechanics
}; };
DynamicStat<float> health = creatureStats.getHealth(); DynamicStat<float> health = creatureStats.getHealth();
bool receivedMagicDamage = false;
for (unsigned int i=0; i<sizeof(damageEffects)/sizeof(int); ++i) for (unsigned int i=0; i<sizeof(damageEffects)/sizeof(int); ++i)
{ {
float magnitude = creatureStats.getMagicEffects().get(damageEffects[i]).getMagnitude(); float magnitude = creatureStats.getMagicEffects().get(damageEffects[i]).getMagnitude();