From a3c0817d81fa1da46a90b3524211bb5870e1b2ae Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 5 Oct 2005 22:30:54 +0000
Subject: [PATCH] prefer AutoActor over Sprite

---
 stepmania/src/DualScrollBar.cpp | 34 ++++++++++++++++-----------------
 stepmania/src/DualScrollBar.h   |  6 +++---
 stepmania/src/ScreenOptions.cpp |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/stepmania/src/DualScrollBar.cpp b/stepmania/src/DualScrollBar.cpp
index d51f76469d..051b65782c 100644
--- a/stepmania/src/DualScrollBar.cpp
+++ b/stepmania/src/DualScrollBar.cpp
@@ -13,23 +13,23 @@ void DualScrollBar::Load( const CString &sType )
 {
 	FOREACH_PlayerNumber( pn )
 	{
-		m_sprScrollThumbUnderHalf[pn].SetName( ssprintf("ThumbP%i", pn+1) );
 		m_sprScrollThumbUnderHalf[pn].Load( THEME->GetPathG(sType,ssprintf("thumb p%i",pn+1)) );
-		this->AddChild( &m_sprScrollThumbUnderHalf[pn] );
+		m_sprScrollThumbUnderHalf[pn]->SetName( ssprintf("ThumbP%i", pn+1) );
+		this->AddChild( m_sprScrollThumbUnderHalf[pn] );
 	}
 
 	FOREACH_PlayerNumber( pn )
 	{
-		m_sprScrollThumbOverHalf[pn].SetName( ssprintf("ThumbP%i", pn+1) );
 		m_sprScrollThumbOverHalf[pn].Load( THEME->GetPathG(sType, ssprintf("thumb p%i",pn+1)) );
-		this->AddChild( &m_sprScrollThumbOverHalf[pn] );
+		m_sprScrollThumbOverHalf[pn]->SetName( ssprintf("ThumbP%i", pn+1) );
+		this->AddChild( m_sprScrollThumbOverHalf[pn] );
 	}
 
-	m_sprScrollThumbUnderHalf[0].SetCropLeft( .5f );
-	m_sprScrollThumbUnderHalf[1].SetCropRight( .5f );
+	m_sprScrollThumbUnderHalf[0]->SetCropLeft( .5f );
+	m_sprScrollThumbUnderHalf[1]->SetCropRight( .5f );
 
-	m_sprScrollThumbOverHalf[0].SetCropRight( .5f );
-	m_sprScrollThumbOverHalf[1].SetCropLeft( .5f );
+	m_sprScrollThumbOverHalf[0]->SetCropRight( .5f );
+	m_sprScrollThumbOverHalf[1]->SetCropLeft( .5f );
 
 	FOREACH_PlayerNumber( pn )
 		SetPercentage( pn, 0 );
@@ -39,23 +39,23 @@ void DualScrollBar::Load( const CString &sType )
 
 void DualScrollBar::EnablePlayer( PlayerNumber pn, bool on )
 {
-	m_sprScrollThumbUnderHalf[pn].SetHidden( !on );
-	m_sprScrollThumbOverHalf[pn].SetHidden( !on );
+	m_sprScrollThumbUnderHalf[pn]->SetHidden( !on );
+	m_sprScrollThumbOverHalf[pn]->SetHidden( !on );
 }
 
 void DualScrollBar::SetPercentage( PlayerNumber pn, float fPercent )
 {
-	const float bottom = m_fBarHeight/2 - m_sprScrollThumbUnderHalf[pn].GetZoomedHeight()/2;
+	const float bottom = m_fBarHeight/2 - m_sprScrollThumbUnderHalf[pn]->GetZoomedHeight()/2;
 	const float top = -bottom;
 
 	/* Position both thumbs. */
-	m_sprScrollThumbUnderHalf[pn].StopTweening();
-	m_sprScrollThumbUnderHalf[pn].BeginTweening( m_fBarTime );
-	m_sprScrollThumbUnderHalf[pn].SetY( SCALE( fPercent, 0, 1, top, bottom ) );
+	m_sprScrollThumbUnderHalf[pn]->StopTweening();
+	m_sprScrollThumbUnderHalf[pn]->BeginTweening( m_fBarTime );
+	m_sprScrollThumbUnderHalf[pn]->SetY( SCALE( fPercent, 0, 1, top, bottom ) );
 
-	m_sprScrollThumbOverHalf[pn].StopTweening();
-	m_sprScrollThumbOverHalf[pn].BeginTweening( m_fBarTime );
-	m_sprScrollThumbOverHalf[pn].SetY( SCALE( fPercent, 0, 1, top, bottom ) );
+	m_sprScrollThumbOverHalf[pn]->StopTweening();
+	m_sprScrollThumbOverHalf[pn]->BeginTweening( m_fBarTime );
+	m_sprScrollThumbOverHalf[pn]->SetY( SCALE( fPercent, 0, 1, top, bottom ) );
 }
 
 /*
diff --git a/stepmania/src/DualScrollBar.h b/stepmania/src/DualScrollBar.h
index 6f2a945d31..d00e456cb0 100644
--- a/stepmania/src/DualScrollBar.h
+++ b/stepmania/src/DualScrollBar.h
@@ -4,7 +4,7 @@
 #define DUAL_SCROLLBAR_H
 
 #include "ActorFrame.h"
-#include "Sprite.h"
+#include "AutoActor.h"
 #include "PlayerNumber.h"
 
 class DualScrollBar: public ActorFrame
@@ -22,8 +22,8 @@ private:
 	float	m_fBarHeight;
 	float	m_fBarTime;
 
-	Sprite	m_sprScrollThumbOverHalf[NUM_PLAYERS];
-	Sprite	m_sprScrollThumbUnderHalf[NUM_PLAYERS];
+	AutoActor	m_sprScrollThumbOverHalf[NUM_PLAYERS];
+	AutoActor	m_sprScrollThumbUnderHalf[NUM_PLAYERS];
 };
 
 #endif
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 971c12193b..0e385fe6ae 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -179,9 +179,9 @@ void ScreenOptions::Init()
 		m_ScrollBar.SetName( "ScrollBar" );
 		m_ScrollBar.SetBarHeight( SCROLL_BAR_HEIGHT );
 		m_ScrollBar.SetBarTime( SCROLL_BAR_TIME );
+		m_ScrollBar.Load( "DualScrollBar" );
 		FOREACH_PlayerNumber( p )
 			m_ScrollBar.EnablePlayer( p, GAMESTATE->IsHumanPlayer(p) );
-		m_ScrollBar.Load( "DualScrollBar" );
 		SET_XY( m_ScrollBar );
 		m_ScrollBar.SetDrawOrder( 2 );
 		m_framePage.AddChild( &m_ScrollBar );