mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-02 12:06:41 +00:00
Code Issues Releases Wiki Activity

Allow fatigue stat to become negative when fatigue damages are taken

Browse source
This commit is contained in:
Emanuel Guevel 2013-12-09 21:13:06 +01:00
parent 77a2179d1e
commit fc8bd1aacb
3 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/creature.cpp
View file

@ -199,7 +199,7 @@ namespace MWClass
else else
{ {
MWMechanics::DynamicStat<float> fatigue(getCreatureStats(ptr).getFatigue()); MWMechanics::DynamicStat<float> fatigue(getCreatureStats(ptr).getFatigue());
fatigue.setCurrent(fatigue.getCurrent() - damage); fatigue.setCurrent(fatigue.getCurrent() - damage, true);
getCreatureStats(ptr).setFatigue(fatigue); getCreatureStats(ptr).setFatigue(fatigue);
} }
} }

2
apps/openmw/mwclass/npc.cpp
View file

@ -669,7 +669,7 @@ namespace MWClass
else else
{ {
MWMechanics::DynamicStat<float> fatigue(getCreatureStats(ptr).getFatigue()); MWMechanics::DynamicStat<float> fatigue(getCreatureStats(ptr).getFatigue());
fatigue.setCurrent(fatigue.getCurrent() - damage); fatigue.setCurrent(fatigue.getCurrent() - damage, true);
getCreatureStats(ptr).setFatigue(fatigue); getCreatureStats(ptr).setFatigue(fatigue);
} }
} }

22
apps/openmw/mwmechanics/stat.hpp
View file

@ -162,14 +162,26 @@ namespace MWMechanics
setCurrent (getCurrent()+diff); setCurrent (getCurrent()+diff);
} }
void setCurrent (const T& value) void setCurrent (const T& value, bool allowDecreaseBelowZero = false)
{ {
mCurrent = value; if (value > mCurrent)
{
// increase
mCurrent = value;
if (mCurrent<0) if (mCurrent > getModified())
mCurrent = getModified();
}
else if (value > 0 || allowDecreaseBelowZero)
{
// allowed decrease
mCurrent = value;
}
else if (mCurrent > 0)
{
// capped decrease
mCurrent = 0; mCurrent = 0;
else if (mCurrent>getModified()) }
mCurrent = getModified();
} }
void setModifier (const T& modifier) void setModifier (const T& modifier)