From 6d974bc5e2ed386c33a05bdf114f491a062b8550 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 6 Dec 2005 02:48:54 +0000 Subject: [PATCH] don't reinit to defaults nudge Load2 and Load3 together --- stepmania/src/ActorScroller.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp index 3b5f0986b2..4f79d5b3c7 100644 --- a/stepmania/src/ActorScroller.cpp +++ b/stepmania/src/ActorScroller.cpp @@ -52,18 +52,15 @@ void ActorScroller::Load2( CLAMP( fSecondsPerItem, 0.01f, 10000 ); CLAMP( fSecondsPauseBetweenItems, 0, 10000 ); - m_fNumItemsToDraw = fNumItemsToDraw; - m_exprTransformFunction.SetFromExpression( ssprintf("function(self,offset,itemIndex,numItems) self:y(%f*offset) end",fItemHeight), 1 ); - m_bLoop = bLoop; m_fSecondsPerItem = fSecondsPerItem; + m_fNumItemsToDraw = fNumItemsToDraw; m_fSecondsPauseBetweenItems = fSecondsPauseBetweenItems; - m_fPauseCountdownSeconds = 0; - m_fQuantizePixels = 0; + m_bLoop = bLoop; m_iNumItems = m_SubActors.size(); ScrollThroughAllItems(); @@ -84,7 +81,6 @@ void ActorScroller::Load3( m_fNumItemsToDraw = fNumItemsToDraw; m_bFastCatchup = bFastCatchup; m_exprTransformFunction.SetFromExpression( sTransformFunction, iSubdivisions ); - m_fQuantizePixels = 0; m_bLoop = bLoop; m_iNumItems = m_SubActors.size(); }