From ea3b5647617baf592392675add9013aff9c262bb Mon Sep 17 00:00:00 2001 From: Thad Ward Date: Mon, 9 Feb 2004 11:49:46 +0000 Subject: [PATCH] change difficulty icons load to handle the current number of difficulties. "ScreenEvaluation score label" and "ScreenEvaluation totalscore label" might be animated sprites as well. --- stepmania/src/ScreenEvaluation.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 9afbbfcb52..de6e5bfd15 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -320,9 +320,9 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) #ifdef _XBOX //shorten filenames for FATX - m_DifficultyIcon[p].Load( THEME->GetPathToG("ScreenEvaluation diff icons 1x5") ); + m_DifficultyIcon[p].Load( THEME->GetPathToG(ssprintf("ScreenEvaluation diff icons 1x%d",NUM_DIFFICULTIES)) ); #else - m_DifficultyIcon[p].Load( THEME->GetPathToG("ScreenEvaluation difficulty icons 1x5") ); + m_DifficultyIcon[p].Load( THEME->GetPathToG(ssprintf("ScreenEvaluation difficulty icons 1x%d",NUM_DIFFICULTIES)) ); #endif m_DifficultyIcon[p].SetFromNotes( (PlayerNumber)p, GAMESTATE->m_pCurNotes[p] ); @@ -655,8 +655,6 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) if( SHOW_SCORE_AREA ) { m_sprScoreLabel.Load( THEME->GetPathToG("ScreenEvaluation score label") ); - m_sprScoreLabel.SetState( 0 ); - m_sprScoreLabel.StopAnimating(); m_sprScoreLabel.SetName( "ScoreLabel" ); SET_XY_AND_ON_COMMAND( m_sprScoreLabel ); this->AddChild( &m_sprScoreLabel ); @@ -679,8 +677,6 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) if( SHOW_TOTAL_SCORE_AREA ) { m_sprTotalScoreLabel.Load( THEME->GetPathToG("ScreenEvaluation totalscore label") ); - m_sprTotalScoreLabel.SetState( 0 ); - m_sprTotalScoreLabel.StopAnimating(); m_sprTotalScoreLabel.SetName( "TotalScoreLabel" ); SET_XY_AND_ON_COMMAND( m_sprTotalScoreLabel ); this->AddChild( &m_sprTotalScoreLabel );