krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Simplify condition

Browse source
This commit is contained in:
scrawl 2016-08-22 22:57:56 +02:00
parent bf9dc45b2b
commit 6450c9be27
3 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1533,8 +1533,8 @@ void CharacterController::update(float duration)
updateMagicEffects(); updateMagicEffects();
if(mAnimQueue.size() > 1 && (mAnimation->getLoopingEnabled(mAnimQueue.front().mGroup) == true)) if(!mAnimQueue.empty())
mAnimation->setLoopingEnabled(mAnimQueue.front().mGroup, false); mAnimation->setLoopingEnabled(mAnimQueue.front().mGroup, mAnimQueue.size() <= 1);
if(!cls.isActor()) if(!cls.isActor())
{ {

8
apps/openmw/mwrender/animation.cpp
View file

@ -1106,14 +1106,6 @@ namespace MWRender
state->second.mLoopingEnabled = enabled; state->second.mLoopingEnabled = enabled;
} }
bool Animation::getLoopingEnabled(const std::string &groupname) const
{
AnimStateMap::const_iterator state(mStates.find(groupname));
if(state != mStates.end())
return state->second.mLoopingEnabled;
return false;
}
void Animation::setObjectRoot(const std::string &model, bool forceskeleton, bool baseonly, bool isCreature) void Animation::setObjectRoot(const std::string &model, bool forceskeleton, bool baseonly, bool isCreature)
{ {
osg::ref_ptr<osg::StateSet> previousStateset; osg::ref_ptr<osg::StateSet> previousStateset;

2
apps/openmw/mwrender/animation.hpp
View file

@ -435,8 +435,6 @@ public:
void setLoopingEnabled(const std::string &groupname, bool enabled); void setLoopingEnabled(const std::string &groupname, bool enabled);
bool getLoopingEnabled(const std::string &groupname) const;
/// This is typically called as part of runAnimation, but may be called manually if needed. /// This is typically called as part of runAnimation, but may be called manually if needed.
void updateEffects(float duration); void updateEffects(float duration);