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

Add a method to clear the animation queue

Browse source
This commit is contained in:
Chris Robinson 2013-05-16 06:59:41 -07:00
parent 6c6200efef
commit 6201cb0093
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -476,9 +476,7 @@ void CharacterController::playGroup(const std::string &groupname, int mode, int
count = std::max(count, 1); count = std::max(count, 1);
if(mode != 0 || mAnimQueue.size() == 0) if(mode != 0 || mAnimQueue.size() == 0)
{ {
if(mAnimQueue.size() > 0) clearAnimQueue();
mAnimation->disable(mAnimQueue.front().first);
mAnimQueue.clear();
mAnimQueue.push_back(std::make_pair(groupname, count-1)); mAnimQueue.push_back(std::make_pair(groupname, count-1));
mCharState = CharState_SpecialIdle; mCharState = CharState_SpecialIdle;
@ -500,6 +498,14 @@ void CharacterController::skipAnim()
} }
void CharacterController::clearAnimQueue()
{
if(mAnimQueue.size() > 0)
mAnimation->disable(mAnimQueue.front().first);
mAnimQueue.clear();
}
void CharacterController::setState(CharacterState state) void CharacterController::setState(CharacterState state)
{ {
if(mCharState == state) if(mCharState == state)
@ -513,9 +519,7 @@ void CharacterController::forceStateUpdate()
{ {
if(!mAnimation) if(!mAnimation)
return; return;
if(mAnimQueue.size() > 0) clearAnimQueue();
mAnimation->disable(mAnimQueue.front().first);
mAnimQueue.clear();
std::string group; std::string group;
Priority prio; Priority prio;

2
apps/openmw/mwmechanics/character.hpp
View file

@ -111,6 +111,8 @@ class CharacterController
static void getWeaponGroup(WeaponType weaptype, std::string &group); static void getWeaponGroup(WeaponType weaptype, std::string &group);
void clearAnimQueue();
public: public:
CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim, CharacterState state); CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim, CharacterState state);
virtual ~CharacterController(); virtual ~CharacterController();