From abeead164e24be807134133dfaf6692bda943b54 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 6 Dec 2005 03:29:16 +0000
Subject: [PATCH] Using ActorScroller adds too many metrics.  Prefer to set
 parameters that aren't needed for initialization and aren't always used via
 commands, not load-time parameters.

---
 stepmania/src/ActorScroller.cpp              | 5 +----
 stepmania/src/ActorScroller.h                | 1 -
 stepmania/src/ScreenNameEntryTraditional.cpp | 1 -
 stepmania/src/ScreenSelectMaster.cpp         | 2 --
 stepmania/src/ScreenSelectMaster.h           | 1 -
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp
index 3399b1aae1..3e77ca458d 100644
--- a/stepmania/src/ActorScroller.cpp
+++ b/stepmania/src/ActorScroller.cpp
@@ -43,14 +43,13 @@ void ActorScroller::Load2(
 	float fItemHeight, 
 	bool bLoop )
 {
-	Load3( fSecondsPerItem, fNumItemsToDraw, false, 
+	Load3( fSecondsPerItem, fNumItemsToDraw,
 		ssprintf("function(self,offset,itemIndex,numItems) self:y(%f*offset) end",fItemHeight), 1, bLoop );
 }
 
 void ActorScroller::Load3(
 	float fSecondsPerItem, 
 	float fNumItemsToDraw, 
-	bool bFastCatchup,
 	const CString &sTransformFunction,
 	int iSubdivisions,
 	bool bLoop
@@ -58,7 +57,6 @@ void ActorScroller::Load3(
 {
 	m_fSecondsPerItem = fSecondsPerItem;
 	m_fNumItemsToDraw = fNumItemsToDraw;
-	m_bFastCatchup = bFastCatchup;
 	m_exprTransformFunction.SetFromExpression( sTransformFunction, iSubdivisions );
 	m_bLoop = bLoop;
 	m_iNumItems = m_SubActors.size();
@@ -122,7 +120,6 @@ void ActorScroller::LoadFromNode( const CString &sDir, const XNode *pNode )
 	Load3( 
 		fSecondsPerItem,
 		fNumItemsToDraw,
-		false,
 		sTransformFunction,
 		iSubdivisions,
 		false );
diff --git a/stepmania/src/ActorScroller.h b/stepmania/src/ActorScroller.h
index b05ca525a0..23ad7a3778 100644
--- a/stepmania/src/ActorScroller.h
+++ b/stepmania/src/ActorScroller.h
@@ -22,7 +22,6 @@ public:
 	void Load3(
 		float fSecondsPerItem, 
 		float fNumItemsToDraw, 
-		bool bFastCatchup,
 		const CString &sTransformFunction,
 		int iSubdivisions,
 		bool bLoop );
diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index 99190f9c53..06902a50f7 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -118,7 +118,6 @@ void HighScoreWheel::Load( const HighScoreList& hsl, int iIndexToFocus )
 	ActorScroller::Load3( 
 		0.2f,
 		10.5,
-		false,
 		sTransformFunction,
 		1,
 		false );
diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index 1285c6fc21..b1a8699e2f 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -39,7 +39,6 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
 	WRAP_CURSOR(m_sName,"WrapCursor"),
 	WRAP_SCROLLER(m_sName,"WrapScroller"),
 	LOOP_SCROLLER(m_sName,"LoopScroller"),
-	SCROLLER_FAST_CATCHUP(m_sName,"ScrollerFastCatchup"),
 	ALLOW_REPEATING_INPUT(m_sName,"AllowRepeatingInput"),
 	SCROLLER_SECONDS_PER_ITEM(m_sName,"ScrollerSecondsPerItem"),
 	SCROLLER_NUM_ITEMS_TO_DRAW(m_sName,"ScrollerNumItemsToDraw"),
@@ -132,7 +131,6 @@ void ScreenSelectMaster::Init()
 			m_Scroller[*p].Load3(
 				SCROLLER_SECONDS_PER_ITEM, 
 				SCROLLER_NUM_ITEMS_TO_DRAW,
-				SCROLLER_FAST_CATCHUP,
 				SCROLLER_TRANSFORM,
 				SCROLLER_SUBDIVISIONS,
 				LOOP_SCROLLER );
diff --git a/stepmania/src/ScreenSelectMaster.h b/stepmania/src/ScreenSelectMaster.h
index 952e8ce815..3821f0c5db 100644
--- a/stepmania/src/ScreenSelectMaster.h
+++ b/stepmania/src/ScreenSelectMaster.h
@@ -48,7 +48,6 @@ protected:
 	ThemeMetric<bool>		WRAP_CURSOR;
 	ThemeMetric<bool>		WRAP_SCROLLER;
 	ThemeMetric<bool>		LOOP_SCROLLER;
-	ThemeMetric<bool>		SCROLLER_FAST_CATCHUP;
 	ThemeMetric<bool>		ALLOW_REPEATING_INPUT;
 	ThemeMetric<float>		SCROLLER_SECONDS_PER_ITEM;
 	ThemeMetric<float>		SCROLLER_NUM_ITEMS_TO_DRAW;