From f770ed29c6e67ff3fa8d5c2bd0f1b51ebdba67e8 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 31 May 2005 08:00:42 +0000
Subject: [PATCH] more m_sID

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

diff --git a/stepmania/src/DualScrollBar.cpp b/stepmania/src/DualScrollBar.cpp
index 8aa2e1331e..d51f76469d 100644
--- a/stepmania/src/DualScrollBar.cpp
+++ b/stepmania/src/DualScrollBar.cpp
@@ -9,19 +9,19 @@ DualScrollBar::DualScrollBar()
 	m_fBarTime = 1;
 }
 
-void DualScrollBar::Load()
+void DualScrollBar::Load( const CString &sType )
 {
 	FOREACH_PlayerNumber( pn )
 	{
 		m_sprScrollThumbUnderHalf[pn].SetName( ssprintf("ThumbP%i", pn+1) );
-		m_sprScrollThumbUnderHalf[pn].Load( THEME->GetPathG(m_sName,ssprintf("thumb p%i",pn+1)) );
+		m_sprScrollThumbUnderHalf[pn].Load( THEME->GetPathG(sType,ssprintf("thumb p%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(m_sName, ssprintf("thumb p%i",pn+1)) );
+		m_sprScrollThumbOverHalf[pn].Load( THEME->GetPathG(sType, ssprintf("thumb p%i",pn+1)) );
 		this->AddChild( &m_sprScrollThumbOverHalf[pn] );
 	}
 
diff --git a/stepmania/src/DualScrollBar.h b/stepmania/src/DualScrollBar.h
index 087df72ac3..6f2a945d31 100644
--- a/stepmania/src/DualScrollBar.h
+++ b/stepmania/src/DualScrollBar.h
@@ -12,7 +12,7 @@ class DualScrollBar: public ActorFrame
 public:
 	DualScrollBar();
 
-	void Load();
+	void Load( const CString &sType );
 	void SetBarHeight( float fHeight ) { m_fBarHeight = fHeight; }
 	void SetBarTime( float fTime ) { m_fBarTime = fTime; }
 	void SetPercentage( PlayerNumber pn, float fPercent );
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 63b5781a01..37887e5c70 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -213,18 +213,18 @@ void ScreenOptions::InitMenu( InputMode im, const vector<OptionRowDefinition> &v
 
 	if( SHOW_SCROLL_BAR )
 	{
-		m_ScrollBar.SetName( "DualScrollBar", "ScrollBar" );
+		m_ScrollBar.SetName( "ScrollBar" );
 		m_ScrollBar.SetBarHeight( SCROLL_BAR_HEIGHT );
 		m_ScrollBar.SetBarTime( SCROLL_BAR_TIME );
 		FOREACH_PlayerNumber( p )
 			m_ScrollBar.EnablePlayer( p, GAMESTATE->IsHumanPlayer(p) );
-		m_ScrollBar.Load();
+		m_ScrollBar.Load( "DualScrollBar" );
 		SET_XY( m_ScrollBar );
 		m_framePage.AddChild( &m_ScrollBar );
 	}
 
 	m_sprMore.Load( THEME->GetPathG( m_sName,"more") );
-	m_sprMore->SetName( m_sName, "More" );
+	m_sprMore->SetName( "More" );
 	SET_XY_AND_ON_COMMAND( m_sprMore );
 	COMMAND( m_sprMore, m_bMoreShown? "ShowMore":"HideMore" );
 	m_framePage.AddChild( m_sprMore );
@@ -247,7 +247,7 @@ void ScreenOptions::InitMenu( InputMode im, const vector<OptionRowDefinition> &v
 	FOREACH_PlayerNumber( p )
 	{
 		m_sprDisqualify[p].Load( THEME->GetPathG(m_sName,"disqualify") );
-		m_sprDisqualify[p]->SetName( m_sName, ssprintf("DisqualifyP%i",p+1) );
+		m_sprDisqualify[p]->SetName( ssprintf("DisqualifyP%i",p+1) );
 		SET_XY_AND_ON_COMMAND( m_sprDisqualify[p] );
 		m_sprDisqualify[p]->SetHidden( true );	// unhide later if handicapping options are discovered
 		m_framePage.AddChild( m_sprDisqualify[p] );