From 5e1cc07ee820efa7b408979f70366d7bb76feb90 Mon Sep 17 00:00:00 2001
From: Jason Hooks <jhooks1@mix.wvu.edu>
Date: Tue, 10 Jan 2012 02:00:04 -0500
Subject: [PATCH] Fixed ancestor ghost crash

---
 apps/openmw/mwrender/animation.cpp         | 6 +++---
 apps/openmw/mwrender/creatureanimation.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index e1420f4771..e315530122 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 eac6a3f19a..c2b95186b8 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)