From 9276a68a0d9dc233e5f6da5af77badf41161fbe7 Mon Sep 17 00:00:00 2001
From: Thad Ward <coderjoe@users.sourceforge.net>
Date: Wed, 27 Aug 2003 12:24:10 +0000
Subject: [PATCH] when the current animation is the same as the one we are
 asked to play, don't bother copying the bones in again, just reset the
 current frame.

---
 stepmania/src/Model.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp
index 18f4bbb866..e5eedaac2d 100644
--- a/stepmania/src/Model.cpp
+++ b/stepmania/src/Model.cpp
@@ -29,6 +29,8 @@ Model::Model ()
 	m_bUseZBuffer = true;
 	m_pCurAnimation = NULL;
 	m_bRevertToDefaultAnimation = false;
+	m_fCurrAnimPlayRate = 1.0f;
+	m_fDefaultAnimPlayRate = 1.0f;
 }
 
 Model::~Model ()
@@ -684,15 +686,24 @@ void Model::DrawPrimitives()
 
 void Model::SetDefaultAnimation( CString sAnimation )
 {
+	m_fDefaultAnimPlayRate = PlayRate;
 	m_sDefaultAnimation = sAnimation;
 }
 
 void Model::PlayAnimation( CString sAniName )
 {
+	msAnimation *pNewAnimation = NULL;
 	if( m_mapNameToAnimation.find(sAniName) == m_mapNameToAnimation.end() )
 		return;
 	else
-		m_pCurAnimation = &m_mapNameToAnimation[sAniName];
+		pNewAnimation = &m_mapNameToAnimation[sAniName];
+
+	m_fCurrFrame = 0;
+
+	if ( m_pCurAnimation == pNewAnimation )
+		return;
+
+	m_pCurAnimation = pNewAnimation;
 
 	// setup bones
 	int nBoneCount = (int)m_pCurAnimation->Bones.size();
@@ -744,8 +755,6 @@ void Model::PlayAnimation( CString sAniName )
 			}
 		}
 	}
-
-	m_fCurrFrame = 0;
 }
 
 float Model::GetCurFrame() { return m_fCurrFrame; };
@@ -766,7 +775,7 @@ Model::AdvanceFrame (float dt)
 	{
 		if( (m_bRevertToDefaultAnimation) && (m_sDefaultAnimation != "") )
 		{
-			this->PlayAnimation( m_sDefaultAnimation );
+			this->PlayAnimation( m_sDefaultAnimation, m_fDefaultAnimPlayRate );
 			m_fCurrFrame = 0.0f;
 			return;
 		}