From 8a2334b4bf20312ccbe67d9ee207965463d13175 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 16 Jun 2005 22:09:03 +0000 Subject: [PATCH] use same fail logic for Oni as for Nonstop --- stepmania/src/GameState.cpp | 4 ++-- stepmania/src/PrefsManager.cpp | 2 +- stepmania/src/PrefsManager.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 81a8154aa6..4ead6880fb 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -1308,9 +1308,9 @@ SongOptions::FailType GameState::GetPlayerFailType( PlayerNumber pn ) const if( this->m_bChangedFailTypeOnScreenSongOptions ) return ft; - if( GAMESTATE->m_PlayMode == PLAY_MODE_NONSTOP ) + if( GAMESTATE->IsCourseMode() ) { - if( PREFSMAN->m_bMinimum1FullSongInNonstop && GAMESTATE->GetCourseSongIndex()==0 ) + if( PREFSMAN->m_bMinimum1FullSongInCourses && GAMESTATE->GetCourseSongIndex()==0 ) ft = max( ft, SongOptions::FAIL_END_OF_SONG ); // take the least harsh of the two FailTypes } else diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index f237a30142..0802f7053f 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -130,7 +130,7 @@ PrefsManager::PrefsManager() : m_iMaxRegenComboAfterMiss ( "MaxRegenComboAfterMiss", 10 ), m_bTwoPlayerRecovery ( "TwoPlayerRecovery", true ), m_bMercifulDrain ( "MercifulDrain", true ), // negative life deltas are scaled by the players life percentage - m_bMinimum1FullSongInNonstop ( "Minimum1FullSongInNonstop", false ), // FEoS for 1st song, FailImmediate thereafter + m_bMinimum1FullSongInCourses ( "Minimum1FullSongInCourses", false ), // FEoS for 1st song, FailImmediate thereafter m_bFailOffInBeginner ( "FailOffInBeginner", false ), m_bFailOffForFirstStageEasy ( "FailOffForFirstStageEasy", false ), m_bMercifulBeginner ( "MercifulBeginner", false ), diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index c13e6baeba..919519d505 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -100,7 +100,7 @@ public: Preference m_iMaxRegenComboAfterMiss; Preference m_bTwoPlayerRecovery; Preference m_bMercifulDrain; // negative life deltas are scaled by the players life percentage - Preference m_bMinimum1FullSongInNonstop; // FEoS for 1st song, FailImmediate thereafter + Preference m_bMinimum1FullSongInCourses; // FEoS for 1st song, FailImmediate thereafter Preference m_bFailOffInBeginner; Preference m_bFailOffForFirstStageEasy; Preference m_bMercifulBeginner; // don't subtract from percent score or grade DP, larger boo window