From fddfd2783e7f39f77a9f2b22ac40191168108bf8 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Thu, 6 Jan 2005 01:51:55 +0000
Subject: [PATCH] allow a scroll time of 0 for non-scrolling lists

---
 stepmania/src/ActorScroller.cpp | 4 ++--
 stepmania/src/ActorScroller.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp
index 5c33e840f6..75b1a41f1c 100644
--- a/stepmania/src/ActorScroller.cpp
+++ b/stepmania/src/ActorScroller.cpp
@@ -27,7 +27,6 @@ void ActorScroller::Load(
 	const RageVector3	&vTranslateTerm2
 	)
 {
-	ASSERT( fSecondsPerItem > 0 );
 	m_fSecondsPerItem = fSecondsPerItem;
 	m_iNumItemsToDraw = iNumItemsToDraw;
 	m_vRotationDegrees = vRotationDegrees;
@@ -45,7 +44,8 @@ void ActorScroller::Update( float fDeltaTime )
 	if( m_fHibernateSecondsLeft > 0 )
 		return;	// early abort
 
-	fapproach( m_fCurrentItem, m_fDestinationItem, fDeltaTime/m_fSecondsPerItem );
+	if( m_fSecondsPerItem > 0 )
+		fapproach( m_fCurrentItem, m_fDestinationItem, fDeltaTime/m_fSecondsPerItem );
 }
 
 void ActorScroller::DrawPrimitives()
diff --git a/stepmania/src/ActorScroller.h b/stepmania/src/ActorScroller.h
index 050a6e7647..fe8929f7d7 100644
--- a/stepmania/src/ActorScroller.h
+++ b/stepmania/src/ActorScroller.h
@@ -29,7 +29,7 @@ protected:
 	bool		m_bLoaded;
 	float		m_fCurrentItem; // usually between 0 and m_SubActors.size()
 	float		m_fDestinationItem;
-	float		m_fSecondsPerItem;
+	float		m_fSecondsPerItem;		// <= 0 means don't scroll
 	int			m_iNumItemsToDraw;
 	
 	// Note: Rotation is applied before translation.