actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

don't reinit to defaults

Browse Source 
nudge Load2 and Load3 together
This commit is contained in:
Glenn Maynard
2005-12-06 02:48:54 +00:00
parent a71723089f
commit 6d974bc5e2
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorScroller.cpp
+2 -6
View File
@@ -52,18 +52,15 @@ void ActorScroller::Load2(
CLAMP( fSecondsPerItem, 0.01f, 10000 ); CLAMP( fSecondsPerItem, 0.01f, 10000 );
CLAMP( fSecondsPauseBetweenItems, 0, 10000 ); CLAMP( fSecondsPauseBetweenItems, 0, 10000 );
m_fNumItemsToDraw = fNumItemsToDraw;
m_exprTransformFunction.SetFromExpression( m_exprTransformFunction.SetFromExpression(
ssprintf("function(self,offset,itemIndex,numItems) self:y(%f*offset) end",fItemHeight), ssprintf("function(self,offset,itemIndex,numItems) self:y(%f*offset) end",fItemHeight),
1 1
); );
m_bLoop = bLoop;
m_fSecondsPerItem = fSecondsPerItem; m_fSecondsPerItem = fSecondsPerItem;
m_fNumItemsToDraw = fNumItemsToDraw;
m_fSecondsPauseBetweenItems = fSecondsPauseBetweenItems; m_fSecondsPauseBetweenItems = fSecondsPauseBetweenItems;
m_fPauseCountdownSeconds = 0; m_bLoop = bLoop;
m_fQuantizePixels = 0;
m_iNumItems = m_SubActors.size(); m_iNumItems = m_SubActors.size();
ScrollThroughAllItems(); ScrollThroughAllItems();
@@ -84,7 +81,6 @@ void ActorScroller::Load3(
m_fNumItemsToDraw = fNumItemsToDraw; m_fNumItemsToDraw = fNumItemsToDraw;
m_bFastCatchup = bFastCatchup; m_bFastCatchup = bFastCatchup;
m_exprTransformFunction.SetFromExpression( sTransformFunction, iSubdivisions ); m_exprTransformFunction.SetFromExpression( sTransformFunction, iSubdivisions );
m_fQuantizePixels = 0;
m_bLoop = bLoop; m_bLoop = bLoop;
m_iNumItems = m_SubActors.size(); m_iNumItems = m_SubActors.size();
} }