actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Glenn Maynard
2003-10-07 02:13:48 +00:00
parent 5af28f3fb1
commit c10fc4407a
1 changed files with 62 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEvaluation.cpp
+60 -37
View File
@@ -726,73 +726,95 @@ void ScreenEvaluation::TweenOffScreen()
} }
// points area // points area
for( p=0; p<NUM_PLAYERS; p++ ) if( SHOW_POINTS_AREA )
{ {
UtilOffCommand( m_sprPercentFrame[p], "ScreenEvaluation" ); for( p=0; p<NUM_PLAYERS; p++ )
m_Percent[p].Command( THEME->GetMetric("ScreenEvaluation",ssprintf("PercentP%dOffCommand",p+1)) ); {
m_Percent[p].TweenOffScreen(); UtilOffCommand( m_sprPercentFrame[p], "ScreenEvaluation" );
m_Percent[p].Command( THEME->GetMetric("ScreenEvaluation",ssprintf("PercentP%dOffCommand",p+1)) );
m_Percent[p].TweenOffScreen();
}
} }
// bonus area // bonus area
for( p=0; p<NUM_PLAYERS; p++ ) if( SHOW_BONUS_AREA )
{ {
if( !GAMESTATE->IsPlayerEnabled(p) ) for( p=0; p<NUM_PLAYERS; p++ )
continue;
UtilOffCommand( m_sprBonusFrame[p], "ScreenEvaluation" );
for( int r=0; r<NUM_RADAR_CATEGORIES; r++ ) // foreach line
{ {
UtilOffCommand( m_sprPossibleBar[p][r], "ScreenEvaluation" ); if( !GAMESTATE->IsPlayerEnabled(p) )
UtilOffCommand( m_sprActualBar[p][r], "ScreenEvaluation" ); continue;
UtilOffCommand( m_sprBonusFrame[p], "ScreenEvaluation" );
for( int r=0; r<NUM_RADAR_CATEGORIES; r++ ) // foreach line
{
UtilOffCommand( m_sprPossibleBar[p][r], "ScreenEvaluation" );
UtilOffCommand( m_sprActualBar[p][r], "ScreenEvaluation" );
}
} }
} }
// survived area // survived area
for( p=0; p<NUM_PLAYERS; p++ ) if( SHOW_SURVIVED_AREA )
{ {
if( !GAMESTATE->IsPlayerEnabled(p) ) for( p=0; p<NUM_PLAYERS; p++ )
continue; {
UtilOffCommand( m_sprSurvivedFrame[p], "ScreenEvaluation" ); if( !GAMESTATE->IsPlayerEnabled(p) )
UtilOffCommand( m_textSurvivedNumber[p], "ScreenEvaluation" ); continue;
UtilOffCommand( m_sprSurvivedFrame[p], "ScreenEvaluation" );
UtilOffCommand( m_textSurvivedNumber[p], "ScreenEvaluation" );
}
} }
// win area // win area
for( p=0; p<NUM_PLAYERS; p++ ) if( SHOW_WIN_AREA )
{ {
if( !GAMESTATE->IsPlayerEnabled(p) ) for( p=0; p<NUM_PLAYERS; p++ )
continue; {
UtilOffCommand( m_sprWinFrame[p], "ScreenEvaluation" ); if( !GAMESTATE->IsPlayerEnabled(p) )
UtilOffCommand( m_sprWin[p], "ScreenEvaluation" ); continue;
UtilOffCommand( m_sprWinFrame[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
UtilOffCommand( m_sprScoreLabel, "ScreenEvaluation" ); if( SHOW_SCORE_AREA )
for( p=0; p<NUM_PLAYERS; p++ )
{ {
if( !GAMESTATE->IsPlayerEnabled(p) ) UtilOffCommand( m_sprScoreLabel, "ScreenEvaluation" );
continue; for( p=0; p<NUM_PLAYERS; p++ )
UtilOffCommand( m_textScore[p], "ScreenEvaluation" ); {
if( !GAMESTATE->IsPlayerEnabled(p) )
continue;
UtilOffCommand( m_textScore[p], "ScreenEvaluation" );
}
} }
// time area // time area
UtilOffCommand( m_sprTimeLabel, "ScreenEvaluation" ); if( SHOW_TIME_AREA )
for( p=0; p<NUM_PLAYERS; p++ )
{ {
if( !GAMESTATE->IsPlayerEnabled(p) ) UtilOffCommand( m_sprTimeLabel, "ScreenEvaluation" );
continue; for( p=0; p<NUM_PLAYERS; p++ )
UtilOffCommand( m_textTime[p], "ScreenEvaluation" ); {
if( !GAMESTATE->IsPlayerEnabled(p) )
continue;
UtilOffCommand( m_textTime[p], "ScreenEvaluation" );
}
} }
// extra area // extra area
@@ -828,7 +850,8 @@ 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;
m_textScore[p].SetText( ssprintf("%*.0i", NUM_SCORE_DIGITS, GAMESTATE->m_CurStageStats.iScore[p]) ); if( SHOW_SCORE_AREA )
m_textScore[p].SetText( ssprintf("%*.0i", NUM_SCORE_DIGITS, GAMESTATE->m_CurStageStats.iScore[p]) );
} }
/* for( int l=0; l<NUM_JUDGE_LINES; l++ ) /* for( int l=0; l<NUM_JUDGE_LINES; l++ )