From 3b36f59a6cc8590b90cc7367c0cad9c397df4b36 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 17 Oct 2005 23:21:16 +0000
Subject: [PATCH] The only place Load3 is ever called with bUseMask true is
 from LoadFromNode.  The code path doesn't give any way of setting the size,
 so it doesn't work.  Remove it, and use EnableMask.

---
 stepmania/src/ActorScroller.cpp              | 6 +++---
 stepmania/src/ActorScroller.h                | 1 -
 stepmania/src/ScreenNameEntryTraditional.cpp | 1 -
 stepmania/src/ScreenSelectMaster.cpp         | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp
index b6ac611e5d..a2eb2517b5 100644
--- a/stepmania/src/ActorScroller.cpp
+++ b/stepmania/src/ActorScroller.cpp
@@ -77,7 +77,6 @@ void ActorScroller::Load3(
 	bool bFastCatchup,
 	const CString &sTransformFunction,
 	int iSubdivisions,
-	bool bUseMask,
 	bool bLoop
 	)
 {
@@ -86,7 +85,6 @@ void ActorScroller::Load3(
 	m_bFastCatchup = bFastCatchup;
 	m_exprTransformFunction.SetFromExpression( sTransformFunction, iSubdivisions );
 	m_fQuantizePixels = 0;
-	m_quadMask.SetHidden( !bUseMask );
 	m_bLoop = bLoop;
 	m_iNumItems = m_SubActors.size();
 }
@@ -152,9 +150,11 @@ void ActorScroller::LoadFromNode( const CString &sDir, const XNode *pNode )
 		false,
 		sTransformFunction,
 		iSubdivisions,
-		bUseMask,
 		false );
 
+	if( bUseMask )
+		EnableMask( 10, 10 ); // XXX
+
 	pNode->GetAttrValue( "QuantizePixels", m_fQuantizePixels );
 
 	/* By default, don't use item numbers.  On scrollers with lots of items,
diff --git a/stepmania/src/ActorScroller.h b/stepmania/src/ActorScroller.h
index db2402e87b..e465f56323 100644
--- a/stepmania/src/ActorScroller.h
+++ b/stepmania/src/ActorScroller.h
@@ -27,7 +27,6 @@ public:
 		bool bFastCatchup,
 		const CString &sTransformFunction,
 		int iSubdivisions,
-		bool bUseMask,
 		bool bLoop );
 
 	void EnableMask( float fWidth, float fHeight );
diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index f8d7ed2557..99190f9c53 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -121,7 +121,6 @@ void HighScoreWheel::Load( const HighScoreList& hsl, int iIndexToFocus )
 		false,
 		sTransformFunction,
 		1,
-		false,
 		false );
 	Scroll();
 }
diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index a1c70c67d4..1285c6fc21 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -135,7 +135,6 @@ void ScreenSelectMaster::Init()
 				SCROLLER_FAST_CATCHUP,
 				SCROLLER_TRANSFORM,
 				SCROLLER_SUBDIVISIONS,
-				false,
 				LOOP_SCROLLER );
 			m_Scroller[*p].SetName( "Scroller"+PLAYER_APPEND_NO_SPACE(*p) );
 			this->AddChild( &m_Scroller[*p] );