From c9ed474856f7943a8e9d682d5603aefc48b0d8b7 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 9 May 2005 00:16:20 +0000 Subject: [PATCH] Minimum1FullSongInCourses - > Minimum1FullSongInNonstop --- 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 9053826593..6eaacbd92a 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -1285,9 +1285,9 @@ SongOptions::FailType GameState::GetPlayerFailType( PlayerNumber pn ) const if( this->m_bChangedFailTypeOnScreenSongOptions ) return ft; - if( this->IsCourseMode() ) + if( GAMESTATE->m_PlayMode == PLAY_MODE_NONSTOP ) { - if( PREFSMAN->m_bMinimum1FullSongInCourses && GAMESTATE->IsCourseMode() && GAMESTATE->GetCourseSongIndex()==0 ) + if( PREFSMAN->m_bMinimum1FullSongInNonstop && 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 c65b7f6984..24e930e5f7 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -130,7 +130,7 @@ PrefsManager::PrefsManager() : m_iMaxRegenComboAfterMiss ( Options, "MaxRegenComboAfterMiss", 10 ), m_bTwoPlayerRecovery ( Options, "TwoPlayerRecovery", true ), m_bMercifulDrain ( Options, "MercifulDrain", true ), // negative life deltas are scaled by the players life percentage - m_bMinimum1FullSongInCourses ( Options, "Minimum1FullSongInCourses", false ), // FEoS for 1st song, FailImmediate thereafter + m_bMinimum1FullSongInNonstop ( Options, "Minimum1FullSongInNonstop", false ), // FEoS for 1st song, FailImmediate thereafter m_bFailOffInBeginner ( Options, "FailOffInBeginner", false ), m_bFailOffForFirstStageEasy ( Options, "FailOffForFirstStageEasy", false ), m_bMercifulBeginner ( Options, "MercifulBeginner", false ), diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 94d0d92aa7..d3fa9ec08a 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -99,7 +99,7 @@ public: Preference m_iMaxRegenComboAfterMiss; Preference m_bTwoPlayerRecovery; Preference m_bMercifulDrain; // negative life deltas are scaled by the players life percentage - Preference m_bMinimum1FullSongInCourses; // FEoS for 1st song, FailImmediate thereafter + Preference m_bMinimum1FullSongInNonstop; // 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