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

Merge pull request #1060 from MiroslavR/fix-anim-state-saving

Browse Source 
Fix animation state not saving in some cases
This commit is contained in:
scrawl 2016-09-15 16:49:15 +02:00 committed by GitHub
commit 0f71efb919
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwworld/refdata.cpp
View File

@ -238,7 +238,7 @@ namespace MWWorld
bool RefData::hasChanged() const bool RefData::hasChanged() const
{ {
return mChanged; return mChanged || !mAnimationState.empty();
} }
bool RefData::activate() bool RefData::activate()

5
components/esm/animationstate.cpp
View File

@ -5,6 +5,11 @@
namespace ESM namespace ESM
{ {
bool AnimationState::empty() const
{
return mScriptedAnims.empty();
}
void AnimationState::load(ESMReader& esm) void AnimationState::load(ESMReader& esm)
{ {
mScriptedAnims.clear(); mScriptedAnims.clear();

2
components/esm/animationstate.hpp
View File

@ -26,6 +26,8 @@ namespace ESM
typedef std::vector<ScriptedAnimation> ScriptedAnimations; typedef std::vector<ScriptedAnimation> ScriptedAnimations;
ScriptedAnimations mScriptedAnims; ScriptedAnimations mScriptedAnims;
bool empty() const;
void load(ESMReader& esm); void load(ESMReader& esm);
void save(ESMWriter& esm) const; void save(ESMWriter& esm) const;
}; };