diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 0b8ff7fb29..4a00fd4bfd 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -900,6 +900,9 @@ void GameState::RestoreSelectedOptions() bool GameState::IsDisqualified( PlayerNumber pn ) { + if( !PREFSMAN->m_bDisqualification ) + return false; + if( GAMESTATE->IsCourseMode() ) { return GAMESTATE->m_PlayerOptions[pn].IsEasierForCourse( diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 1f9cb3fab8..3c596ea7d5 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -162,6 +162,7 @@ PrefsManager::PrefsManager() m_bDancePointsForOni = false; m_bPercentageScoring = false; m_fMinPercentageForHighScore = 0.5f; + m_bDisqualification = false; m_bShowLyrics = true; m_bAutogenSteps = true; m_bAutogenGroupCourses = true; @@ -441,6 +442,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk() ini.GetValue( "Options", "DancePointsForOni", m_bDancePointsForOni ); ini.GetValue( "Options", "PercentageScoring", m_bPercentageScoring ); ini.GetValue( "Options", "MinPercentageForHighScore", m_fMinPercentageForHighScore ); + ini.GetValue( "Options", "Disqualification", m_bDisqualification ); ini.GetValue( "Options", "ShowLyrics", m_bShowLyrics ); ini.GetValue( "Options", "AutogenSteps", m_bAutogenSteps ); ini.GetValue( "Options", "AutogenGroupCourses", m_bAutogenGroupCourses ); @@ -659,6 +661,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() const ini.SetValue( "Options", "DancePointsForOni", m_bDancePointsForOni ); ini.SetValue( "Options", "PercentageScoring", m_bPercentageScoring ); ini.SetValue( "Options", "MinPercentageForHighScore", m_fMinPercentageForHighScore ); + ini.SetValue( "Options", "Disqualification", m_bDisqualification ); ini.SetValue( "Options", "ShowLyrics", m_bShowLyrics ); ini.SetValue( "Options", "AutogenSteps", m_bAutogenSteps ); ini.SetValue( "Options", "AutogenGroupCourses", m_bAutogenGroupCourses ); diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 6e0635c476..366716e463 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -157,6 +157,7 @@ public: bool m_bDancePointsForOni; //DDR-Extreme style dance points instead of max2 percent bool m_bPercentageScoring; float m_fMinPercentageForHighScore; + bool m_bDisqualification; bool m_bShowLyrics; bool m_bAutogenSteps; bool m_bAutogenGroupCourses;