From c004117e24d71f6ac7a38f013394da32278ed9a3 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 3 Aug 2005 03:13:28 +0000 Subject: [PATCH] improve meter text when displaying high/low meter ranges --- stepmania/src/CourseEntryDisplay.cpp | 37 ++++++++++++---------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/stepmania/src/CourseEntryDisplay.cpp b/stepmania/src/CourseEntryDisplay.cpp index fd8ce6fdde..19814c278e 100644 --- a/stepmania/src/CourseEntryDisplay.cpp +++ b/stepmania/src/CourseEntryDisplay.cpp @@ -123,29 +123,24 @@ void CourseEntryDisplay::SetFromGameState( int iCourseEntryIndex ) if( te == NULL || ce == NULL ) continue; + int iLow = ce->iLowMeter; + int iHigh = ce->iHighMeter; + + CString s; + if( iLow == -1 && iHigh != -1 ) + s = ssprintf( "%d+", iHigh ); + else if( iLow != -1 && iHigh == -1 ) + s = ssprintf( "%d-", iLow ); + else if( iLow != -1 && iHigh != -1 ) + s = ssprintf( "%d-%d", iLow, iHigh ); + else + s = "?"; + Difficulty dc = te->dc; if( dc == DIFFICULTY_INVALID ) - { - int iLow = ce->iLowMeter; - int iHigh = ce->iHighMeter; - - CString s; - if( iLow == -1 && iHigh != -1 ) - s = ssprintf( "<=%d", iHigh ); - else if( iLow != -1 && iHigh == -1 ) - s = ssprintf( ">=%d", iLow ); - else if( iLow != -1 && iHigh != -1 ) - s = ssprintf( "%d-%d", iLow, iHigh ); - else - s = "?"; - - RageColor colorNotes = SONGMAN->GetDifficultyColor( te->pSteps->GetDifficulty() ); - SetDifficulty( pn, s, colorNotes ); - } - else - { - SetDifficulty( pn, "?", SONGMAN->GetDifficultyColor( dc ) ); - } + dc = DIFFICULTY_EDIT; + + SetDifficulty( pn, s, SONGMAN->GetDifficultyColor(dc) ); } m_TextBanner.LoadFromString( "??????????", "??????????", "", "", "", "" );