From 691d852d6866eb11fa28cfa9b4d3471a1169f429 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 14 Jul 2006 20:26:11 +0000 Subject: [PATCH] fix DIFFICULTY_INVALID used as a valid value --- stepmania/src/ScreenSelectMusic.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 582a4cf5a0..f33c13cfb0 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -1349,12 +1349,15 @@ void ScreenSelectMusic::SwitchToPreferredDifficulty() break; } - int iDiff = abs(m_vpSteps[i]->GetDifficulty() - GAMESTATE->m_PreferredDifficulty[pn]); - - if( iCurDifference == -1 || iDiff < iCurDifference ) + if( GAMESTATE->m_PreferredDifficulty[pn] != DIFFICULTY_INVALID ) { - iSelection = i; - iCurDifference = iDiff; + int iDiff = abs(m_vpSteps[i]->GetDifficulty() - GAMESTATE->m_PreferredDifficulty[pn]); + + if( iCurDifference == -1 || iDiff < iCurDifference ) + { + iSelection = i; + iCurDifference = iDiff; + } } }