From c399f4f2103168e9125e4d6d44e266244ce1957f Mon Sep 17 00:00:00 2001 From: Jason Hooks Date: Tue, 27 Dec 2011 17:12:47 -0500 Subject: [PATCH] Fixing a few things --- apps/openmw/mwrender/actors.cpp | 3 ++- apps/openmw/mwrender/animation.cpp | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwrender/actors.cpp b/apps/openmw/mwrender/actors.cpp index 6f479d8778..937bf96b04 100644 --- 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){ diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index c6fc13a1fc..e9d6710be2 100644 --- 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())){