From 63b3a5a468f603b23c0187ed5693959db7b0949b Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 9 Jan 2006 21:57:15 +0000 Subject: [PATCH] fix meter displaying --- stepmania/src/CourseEntryDisplay.cpp | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/stepmania/src/CourseEntryDisplay.cpp b/stepmania/src/CourseEntryDisplay.cpp index 1cbb62192d..bd4cd07c5b 100644 --- a/stepmania/src/CourseEntryDisplay.cpp +++ b/stepmania/src/CourseEntryDisplay.cpp @@ -132,15 +132,29 @@ void CourseEntryDisplay::SetFromGameState( int iCourseEntryIndex ) int iLow = ce->iLowMeter; int iHigh = ce->iHighMeter; + bool bLowIsSet = iLow != -1; + bool bHighIsSet = iHigh != -1; + 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 + if( !bLowIsSet && !bHighIsSet ) + { s = "?"; + } + if( !bLowIsSet && bHighIsSet ) + { + s = ssprintf( ">=%d", iHigh ); + } + else if( bLowIsSet && !bHighIsSet ) + { + s = ssprintf( "<=%d", iLow ); + } + else if( bLowIsSet && bHighIsSet ) + { + if( iLow == iHigh ) + s = ssprintf( "%d", iLow ); + else + s = ssprintf( "%d-%d", iLow, iHigh ); + } Difficulty dc = te->dc; if( dc == DIFFICULTY_INVALID )