mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-19 08:36:47 +00:00
Code Issues Releases Wiki Activity

Merge branch 'oopsy' into 'master'

Browse source 
Expect recent saves to store the modified value

Closes #6604

See merge request OpenMW/openmw!1649
This commit is contained in:
Alexei Kotov 2022-02-12 14:24:51 +00:00
commit c1cd3ba9a1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmechanics/stat.cpp
View file

@ -21,13 +21,13 @@ namespace MWMechanics
void Stat<T>::writeState (ESM::StatState<T>& state) const void Stat<T>::writeState (ESM::StatState<T>& state) const
{ {
state.mBase = mBase; state.mBase = mBase;
state.mMod = mModifier; state.mMod = mModifier + mBase;
} }
template<typename T> template<typename T>
void Stat<T>::readState (const ESM::StatState<T>& state) void Stat<T>::readState (const ESM::StatState<T>& state)
{ {
mBase = state.mBase; mBase = state.mBase;
mModifier = state.mMod; mModifier = state.mMod - mBase;
} }

4
apps/openmw/mwworld/magiceffects.cpp
View file

@ -201,10 +201,10 @@ namespace MWWorld
{ {
auto& dynamic = creatureStats.mDynamic[i]; auto& dynamic = creatureStats.mDynamic[i];
dynamic.mCurrent -= dynamic.mMod - dynamic.mBase; dynamic.mCurrent -= dynamic.mMod - dynamic.mBase;
dynamic.mMod = 0.f; dynamic.mMod = dynamic.mBase;
} }
for(std::size_t i = 0; i < 4; ++i) for(std::size_t i = 0; i < 4; ++i)
creatureStats.mAiSettings[i].mMod = 0.f; creatureStats.mAiSettings[i].mMod = creatureStats.mAiSettings[i].mBase;
if(npcStats) if(npcStats)
{ {
for(std::size_t i = 0; i < ESM::Skill::Length; ++i) for(std::size_t i = 0; i < ESM::Skill::Length; ++i)