mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 12:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Support fatigue below zero for the Drain effect (Fixes #2430)

Browse Source
This commit is contained in:
scrawl 2015-03-07 16:30:41 +01:00
parent 3d5c1d1190
commit 36e1b6cc48
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwmechanics/actors.cpp
View File

@ -547,7 +547,9 @@ namespace MWMechanics
{ {
DynamicStat<float> stat = creatureStats.getDynamic(i); DynamicStat<float> stat = creatureStats.getDynamic(i);
stat.setModifier(effects.get(ESM::MagicEffect::FortifyHealth+i).getMagnitude() - stat.setModifier(effects.get(ESM::MagicEffect::FortifyHealth+i).getMagnitude() -
effects.get(ESM::MagicEffect::DrainHealth+i).getMagnitude()); effects.get(ESM::MagicEffect::DrainHealth+i).getMagnitude(),
// Fatigue can be decreased below zero meaning the actor will be knocked out
i == 2);
float currentDiff = creatureStats.getMagicEffects().get(ESM::MagicEffect::RestoreHealth+i).getMagnitude() float currentDiff = creatureStats.getMagicEffects().get(ESM::MagicEffect::RestoreHealth+i).getMagnitude()

8
apps/openmw/mwmechanics/stat.hpp
View File

@ -170,10 +170,10 @@ namespace MWMechanics
} }
/// Change modified relatively. /// Change modified relatively.
void modify (const T& diff) void modify (const T& diff, bool allowCurrentDecreaseBelowZero=false)
{ {
mStatic.modify (diff); mStatic.modify (diff);
setCurrent (getCurrent()+diff); setCurrent (getCurrent()+diff, allowCurrentDecreaseBelowZero);
} }
void setCurrent (const T& value, bool allowDecreaseBelowZero = false) void setCurrent (const T& value, bool allowDecreaseBelowZero = false)
@ -198,11 +198,11 @@ namespace MWMechanics
} }
} }
void setModifier (const T& modifier) void setModifier (const T& modifier, bool allowCurrentDecreaseBelowZero=false)
{ {
T diff = modifier - mStatic.getModifier(); T diff = modifier - mStatic.getModifier();
mStatic.setModifier (modifier); mStatic.setModifier (modifier);
setCurrent (getCurrent()+diff); setCurrent (getCurrent()+diff, allowCurrentDecreaseBelowZero);
} }
void writeState (ESM::StatState<T>& state) const void writeState (ESM::StatState<T>& state) const