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:
@@ -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,
|
||||
|
||||
@@ -27,7 +27,6 @@ public:
|
||||
bool bFastCatchup,
|
||||
const CString &sTransformFunction,
|
||||
int iSubdivisions,
|
||||
bool bUseMask,
|
||||
bool bLoop );
|
||||
|
||||
void EnableMask( float fWidth, float fHeight );
|
||||
|
||||
@@ -121,7 +121,6 @@ void HighScoreWheel::Load( const HighScoreList& hsl, int iIndexToFocus )
|
||||
false,
|
||||
sTransformFunction,
|
||||
1,
|
||||
false,
|
||||
false );
|
||||
Scroll();
|
||||
}
|
||||
|
||||
@@ -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] );
|
||||
|
||||
Reference in New Issue
Block a user