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

reduce dependency on m_Type

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-11 03:15:22 +00:00
parent 97fb44e183
commit 887d9eacbc
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEvaluation.cpp
+8 -21
View File
@@ -255,7 +255,8 @@ void ScreenEvaluation::Init()
m_bTryExtraStage =
GAMESTATE->HasEarnedExtraStage() &&
m_Type==stage;
!GAMESTATE->IsCourseMode() &&
m_Type != summary;
//
@@ -322,34 +323,20 @@ void ScreenEvaluation::Init()
FOREACH_EnabledPlayer( p )
{
m_DifficultyIcon[p].Load( THEME->GetPathG(m_sName,"difficulty icons") );
switch( m_Type )
{
case stage:
m_DifficultyIcon[p].SetFromSteps( p, GAMESTATE->m_pCurSteps[p] );
break;
case course:
if( GAMESTATE->IsCourseMode() )
m_DifficultyIcon[p].SetFromTrail( p, GAMESTATE->m_pCurTrail[p] );
break;
default:
ASSERT(0);
}
else
m_DifficultyIcon[p].SetFromSteps( p, GAMESTATE->m_pCurSteps[p] );
m_DifficultyIcon[p].SetName( ssprintf("DifficultyIconP%d",p+1) );
SET_XY_AND_ON_COMMAND( m_DifficultyIcon[p] );
this->AddChild( &m_DifficultyIcon[p] );
m_DifficultyMeter[p].SetName( ssprintf("DifficultyMeterP%d",p+1) );
m_DifficultyMeter[p].Load( ssprintf("ScreenEvaluation DifficultyMeterP%d",p+1) );
switch( m_Type )
{
case stage:
m_DifficultyMeter[p].SetFromSteps( GAMESTATE->m_pCurSteps[p] );
break;
case course:
if( GAMESTATE->IsCourseMode() )
m_DifficultyMeter[p].SetFromTrail( GAMESTATE->m_pCurTrail[p] );
break;
default:
ASSERT(0);
}
else
m_DifficultyMeter[p].SetFromSteps( GAMESTATE->m_pCurSteps[p] );
SET_XY_AND_ON_COMMAND( m_DifficultyMeter[p] );
this->AddChild( &m_DifficultyMeter[p] );