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.
This commit is contained in:
Glenn Maynard
2005-10-17 23:21:16 +00:00
parent 9608af3c8d
commit 3b36f59a6c
4 changed files with 3 additions and 6 deletions
+3 -3
View File
@@ -77,7 +77,6 @@ void ActorScroller::Load3(
bool bFastCatchup, bool bFastCatchup,
const CString &sTransformFunction, const CString &sTransformFunction,
int iSubdivisions, int iSubdivisions,
bool bUseMask,
bool bLoop bool bLoop
) )
{ {
@@ -86,7 +85,6 @@ void ActorScroller::Load3(
m_bFastCatchup = bFastCatchup; m_bFastCatchup = bFastCatchup;
m_exprTransformFunction.SetFromExpression( sTransformFunction, iSubdivisions ); m_exprTransformFunction.SetFromExpression( sTransformFunction, iSubdivisions );
m_fQuantizePixels = 0; m_fQuantizePixels = 0;
m_quadMask.SetHidden( !bUseMask );
m_bLoop = bLoop; m_bLoop = bLoop;
m_iNumItems = m_SubActors.size(); m_iNumItems = m_SubActors.size();
} }
@@ -152,9 +150,11 @@ void ActorScroller::LoadFromNode( const CString &sDir, const XNode *pNode )
false, false,
sTransformFunction, sTransformFunction,
iSubdivisions, iSubdivisions,
bUseMask,
false ); false );
if( bUseMask )
EnableMask( 10, 10 ); // XXX
pNode->GetAttrValue( "QuantizePixels", m_fQuantizePixels ); pNode->GetAttrValue( "QuantizePixels", m_fQuantizePixels );
/* By default, don't use item numbers. On scrollers with lots of items, /* By default, don't use item numbers. On scrollers with lots of items,
-1
View File
@@ -27,7 +27,6 @@ public:
bool bFastCatchup, bool bFastCatchup,
const CString &sTransformFunction, const CString &sTransformFunction,
int iSubdivisions, int iSubdivisions,
bool bUseMask,
bool bLoop ); bool bLoop );
void EnableMask( float fWidth, float fHeight ); void EnableMask( float fWidth, float fHeight );
@@ -121,7 +121,6 @@ void HighScoreWheel::Load( const HighScoreList& hsl, int iIndexToFocus )
false, false,
sTransformFunction, sTransformFunction,
1, 1,
false,
false ); false );
Scroll(); Scroll();
} }
-1
View File
@@ -135,7 +135,6 @@ void ScreenSelectMaster::Init()
SCROLLER_FAST_CATCHUP, SCROLLER_FAST_CATCHUP,
SCROLLER_TRANSFORM, SCROLLER_TRANSFORM,
SCROLLER_SUBDIVISIONS, SCROLLER_SUBDIVISIONS,
false,
LOOP_SCROLLER ); LOOP_SCROLLER );
m_Scroller[*p].SetName( "Scroller"+PLAYER_APPEND_NO_SPACE(*p) ); m_Scroller[*p].SetName( "Scroller"+PLAYER_APPEND_NO_SPACE(*p) );
this->AddChild( &m_Scroller[*p] ); this->AddChild( &m_Scroller[*p] );