Don't tween off stuff that isn't used.

This commit is contained in:
Glenn Maynard
2003-10-07 02:13:48 +00:00
parent 5af28f3fb1
commit c10fc4407a
+24 -1
View File
@@ -726,14 +726,19 @@ void ScreenEvaluation::TweenOffScreen()
} }
// points area // points area
if( SHOW_POINTS_AREA )
{
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{ {
UtilOffCommand( m_sprPercentFrame[p], "ScreenEvaluation" ); UtilOffCommand( m_sprPercentFrame[p], "ScreenEvaluation" );
m_Percent[p].Command( THEME->GetMetric("ScreenEvaluation",ssprintf("PercentP%dOffCommand",p+1)) ); m_Percent[p].Command( THEME->GetMetric("ScreenEvaluation",ssprintf("PercentP%dOffCommand",p+1)) );
m_Percent[p].TweenOffScreen(); m_Percent[p].TweenOffScreen();
} }
}
// bonus area // bonus area
if( SHOW_BONUS_AREA )
{
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{ {
if( !GAMESTATE->IsPlayerEnabled(p) ) if( !GAMESTATE->IsPlayerEnabled(p) )
@@ -745,8 +750,11 @@ void ScreenEvaluation::TweenOffScreen()
UtilOffCommand( m_sprActualBar[p][r], "ScreenEvaluation" ); UtilOffCommand( m_sprActualBar[p][r], "ScreenEvaluation" );
} }
} }
}
// survived area // survived area
if( SHOW_SURVIVED_AREA )
{
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{ {
if( !GAMESTATE->IsPlayerEnabled(p) ) if( !GAMESTATE->IsPlayerEnabled(p) )
@@ -754,8 +762,11 @@ void ScreenEvaluation::TweenOffScreen()
UtilOffCommand( m_sprSurvivedFrame[p], "ScreenEvaluation" ); UtilOffCommand( m_sprSurvivedFrame[p], "ScreenEvaluation" );
UtilOffCommand( m_textSurvivedNumber[p], "ScreenEvaluation" ); UtilOffCommand( m_textSurvivedNumber[p], "ScreenEvaluation" );
} }
}
// win area // win area
if( SHOW_WIN_AREA )
{
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{ {
if( !GAMESTATE->IsPlayerEnabled(p) ) if( !GAMESTATE->IsPlayerEnabled(p) )
@@ -763,21 +774,28 @@ void ScreenEvaluation::TweenOffScreen()
UtilOffCommand( m_sprWinFrame[p], "ScreenEvaluation" ); UtilOffCommand( m_sprWinFrame[p], "ScreenEvaluation" );
UtilOffCommand( m_sprWin[p], "ScreenEvaluation" ); UtilOffCommand( m_sprWin[p], "ScreenEvaluation" );
} }
}
// judgement area // judgement area
int l; int l;
for( l=0; l<NUM_JUDGE_LINES; l++ ) for( l=0; l<NUM_JUDGE_LINES; l++ )
{
if( !SHOW_JUDGMENT(l) )
continue;
UtilOffCommand( m_sprJudgeLabels[l], "ScreenEvaluation" ); UtilOffCommand( m_sprJudgeLabels[l], "ScreenEvaluation" );
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{ {
if( !GAMESTATE->IsPlayerEnabled(p) ) if( !GAMESTATE->IsPlayerEnabled(p) )
continue; continue;
for( l=0; l<NUM_JUDGE_LINES; l++ )
UtilOffCommand( m_textJudgeNumbers[l][p], "ScreenEvaluation" ); UtilOffCommand( m_textJudgeNumbers[l][p], "ScreenEvaluation" );
} }
}
// score area // score area
if( SHOW_SCORE_AREA )
{
UtilOffCommand( m_sprScoreLabel, "ScreenEvaluation" ); UtilOffCommand( m_sprScoreLabel, "ScreenEvaluation" );
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{ {
@@ -785,8 +803,11 @@ void ScreenEvaluation::TweenOffScreen()
continue; continue;
UtilOffCommand( m_textScore[p], "ScreenEvaluation" ); UtilOffCommand( m_textScore[p], "ScreenEvaluation" );
} }
}
// time area // time area
if( SHOW_TIME_AREA )
{
UtilOffCommand( m_sprTimeLabel, "ScreenEvaluation" ); UtilOffCommand( m_sprTimeLabel, "ScreenEvaluation" );
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{ {
@@ -794,6 +815,7 @@ void ScreenEvaluation::TweenOffScreen()
continue; continue;
UtilOffCommand( m_textTime[p], "ScreenEvaluation" ); UtilOffCommand( m_textTime[p], "ScreenEvaluation" );
} }
}
// extra area // extra area
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
@@ -828,6 +850,7 @@ void ScreenEvaluation::Update( float fDeltaTime )
GAMESTATE->m_CurStageStats.iBonus[p] -= increment; GAMESTATE->m_CurStageStats.iBonus[p] -= increment;
GAMESTATE->m_CurStageStats.iScore[p] += increment; GAMESTATE->m_CurStageStats.iScore[p] += increment;
if( SHOW_SCORE_AREA )
m_textScore[p].SetText( ssprintf("%*.0i", NUM_SCORE_DIGITS, GAMESTATE->m_CurStageStats.iScore[p]) ); m_textScore[p].SetText( ssprintf("%*.0i", NUM_SCORE_DIGITS, GAMESTATE->m_CurStageStats.iScore[p]) );
} }