diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp index abd4309189..9ef916b14f 100644 --- a/stepmania/src/ActorScroller.cpp +++ b/stepmania/src/ActorScroller.cpp @@ -38,12 +38,11 @@ ActorScroller::ActorScroller() } void ActorScroller::Load2( - float fSecondsPerItem, float fNumItemsToDraw, float fItemHeight, bool bLoop ) { - Load3( fSecondsPerItem, fNumItemsToDraw, + Load3( 0, fNumItemsToDraw, ssprintf("function(self,offset,itemIndex,numItems) self:y(%f*offset) end",fItemHeight), 1, bLoop ); } diff --git a/stepmania/src/ActorScroller.h b/stepmania/src/ActorScroller.h index f3e259614e..daa842003e 100644 --- a/stepmania/src/ActorScroller.h +++ b/stepmania/src/ActorScroller.h @@ -14,7 +14,6 @@ public: ActorScroller(); void Load2( - float fSecondsPerItem, float fNumItemsToDraw, float fItemHeight, bool bLoop ); diff --git a/stepmania/src/CourseContentsList.cpp b/stepmania/src/CourseContentsList.cpp index 27c9d22cc3..eb0d04b93f 100644 --- a/stepmania/src/CourseContentsList.cpp +++ b/stepmania/src/CourseContentsList.cpp @@ -78,10 +78,10 @@ void CourseContentsList::SetFromGameState() bool bLoop = pMasterTrail->m_vEntries.size() > uNumEntriesToShow; this->Load2( - 0.7f, (float)MAX_VISIBLE_ITEMS, m_vpDisplay[0]->GetUnzoomedHeight(), bLoop ); + this->SetSecondsPerItem( 0.7f ); this->EnableMask( m_vpDisplay[0]->GetUnzoomedWidth(), m_vpDisplay[0]->GetUnzoomedHeight() ); this->SetSecondsPauseBetweenItems( 0.7f ); this->ScrollThroughAllItems(); diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp index ccf5419165..548bf2edae 100644 --- a/stepmania/src/ScreenRanking.cpp +++ b/stepmania/src/ScreenRanking.cpp @@ -365,7 +365,8 @@ void ScoreScroller::Load( for( int i=0; iAddChild( new ScoreRowItem(ItemTemplate) ); - DynamicActorScroller::Load2( SONG_SCORE_SECONDS_PER_ROW, (float) m_metricSongScoreRowsToDraw, fItemHeight, false ); + DynamicActorScroller::Load2( (float) m_metricSongScoreRowsToDraw, fItemHeight, false ); + DynamicActorScroller::SetSecondsPerItem( SONG_SCORE_SECONDS_PER_ROW ); DynamicActorScroller::EnableMask( SCREEN_WIDTH, fItemHeight ); DynamicActorScroller::ScrollThroughAllItems();