diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp index 36eba03c84..0ed57215ac 100644 --- a/stepmania/src/ActorScroller.cpp +++ b/stepmania/src/ActorScroller.cpp @@ -39,10 +39,7 @@ ActorScroller::ActorScroller() DisableMask(); } -void ActorScroller::Load2( - float fNumItemsToDraw, - bool bLoop - ) +void ActorScroller::Load2( float fNumItemsToDraw ) { m_fNumItemsToDraw = fNumItemsToDraw; m_iNumItems = m_SubActors.size(); @@ -124,9 +121,7 @@ void ActorScroller::LoadFromNode( const RString &sDir, const XNode *pNode ) #undef GET_VALUE - Load2( - fNumItemsToDraw, - false ); + Load2( fNumItemsToDraw ); float fSecondsPerItem = 0; if( pNode->GetAttrValue("SecondsPerItem", fSecondsPerItem) ) diff --git a/stepmania/src/ActorScroller.h b/stepmania/src/ActorScroller.h index 35aa572ade..d0b75874ae 100644 --- a/stepmania/src/ActorScroller.h +++ b/stepmania/src/ActorScroller.h @@ -16,9 +16,7 @@ public: void SetTransformFromExpression( const RString &sTransformFunction ); void SetTransformFromHeight( float fItemHeight ); - void Load2( - float fNumItemsToDraw, - bool bLoop = false ); + void Load2( float fNumItemsToDraw ); void EnableMask( float fWidth, float fHeight ); void DisableMask(); diff --git a/stepmania/src/CourseContentsList.cpp b/stepmania/src/CourseContentsList.cpp index 6c77770082..9018b49b1a 100644 --- a/stepmania/src/CourseContentsList.cpp +++ b/stepmania/src/CourseContentsList.cpp @@ -73,9 +73,7 @@ void CourseContentsList::SetFromGameState() bool bLoop = pMasterTrail->m_vEntries.size() > uNumEntriesToShow; this->SetLoop( bLoop ); - this->Load2( - (float)MAX_VISIBLE_ITEMS, - bLoop ); + this->Load2( (float)MAX_VISIBLE_ITEMS ); this->SetTransformFromHeight( m_vpDisplay[0]->GetUnzoomedHeight() ); this->SetSecondsPerItem( 0.7f ); this->EnableMask( m_vpDisplay[0]->GetUnzoomedWidth(), m_vpDisplay[0]->GetUnzoomedHeight() ); diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp index 74989d5299..66c48c8c41 100644 --- a/stepmania/src/ScreenMapControllers.cpp +++ b/stepmania/src/ScreenMapControllers.cpp @@ -150,7 +150,7 @@ void ScreenMapControllers::Init() m_LineScroller.SetName( "LineScroller" ); ActorUtil::LoadAllCommands( m_LineScroller, m_sName ); - m_LineScroller.Load2( (float) m_LineScroller.GetNumChildren()*2, false ); + m_LineScroller.Load2( (float) m_LineScroller.GetNumChildren()*2 ); this->AddChild( &m_LineScroller ); } diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index fec5b89ff6..ebe2afa709 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -116,9 +116,7 @@ void HighScoreWheel::Load( const HighScoreList& hsl, int iIndexToFocus ) " self:y(math.sin(radians)*90); " " self:z(math.cos(radians)*90); " "end"; - ActorScroller::Load2( - 10.5, - false ); + ActorScroller::Load2( 10.5 ); ActorScroller::SetTransformFromExpression( sTransformFunction ); ActorScroller::SetSecondsPerItem( 0.2f ); Scroll(); diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp index cc81f58be1..d63b3d3ce2 100644 --- a/stepmania/src/ScreenRanking.cpp +++ b/stepmania/src/ScreenRanking.cpp @@ -389,7 +389,7 @@ void ScoreScroller::Load( for( int i=0; iAddChild( new ScoreRowItem(ItemTemplate) ); - DynamicActorScroller::Load2( (float) m_metricSongScoreRowsToDraw, false ); + DynamicActorScroller::Load2( (float) m_metricSongScoreRowsToDraw ); DynamicActorScroller::SetTransformFromHeight( fItemHeight ); DynamicActorScroller::SetSecondsPerItem( SONG_SCORE_SECONDS_PER_ROW ); DynamicActorScroller::EnableMask( SCREEN_WIDTH, fItemHeight ); diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index e674bded60..a691a956e4 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -153,9 +153,7 @@ void ScreenSelectMaster::Init() FOREACH( PlayerNumber, vpns, p ) { m_Scroller[*p].SetLoop( LOOP_SCROLLER ); - m_Scroller[*p].Load2( - SCROLLER_NUM_ITEMS_TO_DRAW, - LOOP_SCROLLER ); + m_Scroller[*p].Load2( SCROLLER_NUM_ITEMS_TO_DRAW ); m_Scroller[*p].SetTransformFromExpression( SCROLLER_TRANSFORM ); m_Scroller[*p].SetSecondsPerItem( SCROLLER_SECONDS_PER_ITEM ); m_Scroller[*p].SetNumSubdivisions( SCROLLER_SUBDIVISIONS );