From 3e4e98de4934fcb9310a43f02c9eb1b26b778476 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 5 Mar 2005 23:06:52 +0000 Subject: [PATCH] fix Meter color for blank slots --- stepmania/src/EditMenu.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index b617c668c6..212abc6ecd 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -281,9 +281,12 @@ void EditMenu::OnRowValueChanged( Row row ) CString s = DifficultyToThemedString(GetSelectedDifficulty()); Steps *pSteps = GetSelectedSteps(); if( pSteps && GetSelectedDifficulty() == DIFFICULTY_EDIT ) - s += " - " pSteps->GetDescription(); + s += " - " + pSteps->GetDescription(); m_textValue[ROW_STEPS].SetText( s ); - m_Meter.SetFromSteps( GetSelectedSteps() ); + if( GetSelectedSteps() ) + m_Meter.SetFromSteps( GetSelectedSteps() ); + else + m_Meter.SetFromMeterAndDifficulty( 0, GetSelectedDifficulty() ); } // fall through case ROW_SOURCE_STEPS_TYPE: @@ -308,7 +311,10 @@ void EditMenu::OnRowValueChanged( Row row ) m_textLabel[ROW_SOURCE_STEPS].SetHidden( GetSelectedSteps() ? true : false ); m_textValue[ROW_SOURCE_STEPS].SetHidden( GetSelectedSteps() ? true : false ); m_textValue[ROW_SOURCE_STEPS].SetText( DifficultyToThemedString(GetSelectedSourceDifficulty()) ); - m_SourceMeter.SetFromSteps( GetSelectedSourceSteps() ); + if( GetSelectedSourceSteps() ) + m_SourceMeter.SetFromSteps( GetSelectedSourceSteps() ); + else + m_SourceMeter.SetFromMeterAndDifficulty( 0, GetSelectedSourceDifficulty() ); m_SourceMeter.SetHidden( GetSelectedSteps() ? true : false ); m_Actions.clear();