diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index e1420f477..e31553012 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -408,7 +408,7 @@ namespace MWRender{ if(time < iter->getStartTime() || time < startTime || time > iter->getStopTime()) { slot++; - iter++; + //iter++; continue; } @@ -442,14 +442,13 @@ namespace MWRender{ t = (v1 + (v2 - v1) * x); } - + bool bQuats = quats.size() > 0; if(bQuats){ r = Ogre::Quaternion::Slerp(x2, quats[rindexI[slot]], quats[rindexJ], true); //bone->setOrientation(r); } skel = base->getSkeleton(); - if(skel->hasBone(iter->getBonename())){ Ogre::Bone* bone = skel->getBone(iter->getBonename()); if(bTrans) @@ -485,4 +484,5 @@ namespace MWRender{ } } } + } \ No newline at end of file diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp index eac6a3f19..c2b95186b 100644 --- a/apps/openmw/mwrender/creatureanimation.cpp +++ b/apps/openmw/mwrender/creatureanimation.cpp @@ -45,7 +45,7 @@ void CreatureAnimation::runAnimation(float timepassed){ //Handle the shapes dependent on animation transforms time += timepassed; - if(time > stopTime){ + if(time >= stopTime){ animate--; //std::cout << "Stopping the animation\n"; if(animate == 0)