Fixing a few things

13 years ago · c399f4f210
parent 1a90f4241b
commit c399f4f210
2 changed files with 5 additions and 2 deletions
--- a/apps/openmw/mwrender/actors.cpp
+++ b/apps/openmw/mwrender/actors.cpp
@ -114,7 +114,8 @@ void Actors::removeCell(MWWorld::Ptr::CellStore* store){
 }

 void Actors::playAnimationGroup (const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number){
-    mAllActors.find(ptr)->second->startScript(groupName, mode, number);
+    if(mAllActors.find(ptr) != mAllActors.end())
+        mAllActors[ptr]->startScript(groupName, mode, number);
 }
 void Actors::skipAnimation (const MWWorld::Ptr& ptr){

--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@ -354,8 +354,10 @@ namespace MWRender{
    for(iter = transformations->begin(); iter != transformations->end(); iter++){
        if(time < iter->getStartTime() || time < startTime || time > iter->getStopTime())
 	    {
-		    continue;
            slot++;
+            iter++;
+		    continue;
+            
 	    }

    if(skel->hasBone(iter->getBonename())){