let PreferredDifficulty have an effect even if PreferredStepsType isn't set

This commit is contained in:
Chris Danford
2007-08-25 07:23:15 +00:00
parent 09e3f1872e
commit 43925dffee
+4 -2
View File
@@ -1058,10 +1058,12 @@ void ScreenSelectMusic::SwitchToPreferredDifficulty()
break;
}
if( GAMESTATE->m_PreferredDifficulty[pn] != Difficulty_Invalid && GAMESTATE->m_PreferredStepsType != StepsType_Invalid )
if( GAMESTATE->m_PreferredDifficulty[pn] != Difficulty_Invalid )
{
int iDifficultyDifference = abs( (*s)->GetDifficulty() - GAMESTATE->m_PreferredDifficulty[pn] );
int iStepsTypeDifference = abs( (*s)->m_StepsType - GAMESTATE->m_PreferredStepsType );
int iStepsTypeDifference = 0;
if( GAMESTATE->m_PreferredStepsType != StepsType_Invalid )
iStepsTypeDifference = abs( (*s)->m_StepsType - GAMESTATE->m_PreferredStepsType );
int iTotalDifference = iStepsTypeDifference * NUM_Difficulty + iDifficultyDifference;
if( iCurDifference == -1 || iTotalDifference < iCurDifference )