actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Minimum1FullSongInCourses - > Minimum1FullSongInNonstop

Browse Source
This commit is contained in:
Chris Danford
2005-05-09 00:16:20 +00:00
parent a87bc7f657
commit c9ed474856
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+2 -2
View File
@@ -1285,9 +1285,9 @@ SongOptions::FailType GameState::GetPlayerFailType( PlayerNumber pn ) const
if( this->m_bChangedFailTypeOnScreenSongOptions ) if( this->m_bChangedFailTypeOnScreenSongOptions )
return ft; 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 ft = max( ft, SongOptions::FAIL_END_OF_SONG ); // take the least harsh of the two FailTypes
} }
else else
stepmania/src/PrefsManager.cpp
+1 -1
View File
@@ -130,7 +130,7 @@ PrefsManager::PrefsManager() :
m_iMaxRegenComboAfterMiss ( Options, "MaxRegenComboAfterMiss", 10 ), m_iMaxRegenComboAfterMiss ( Options, "MaxRegenComboAfterMiss", 10 ),
m_bTwoPlayerRecovery ( Options, "TwoPlayerRecovery", true ), m_bTwoPlayerRecovery ( Options, "TwoPlayerRecovery", true ),
m_bMercifulDrain ( Options, "MercifulDrain", true ), // negative life deltas are scaled by the players life percentage 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_bFailOffInBeginner ( Options, "FailOffInBeginner", false ),
m_bFailOffForFirstStageEasy ( Options, "FailOffForFirstStageEasy", false ), m_bFailOffForFirstStageEasy ( Options, "FailOffForFirstStageEasy", false ),
m_bMercifulBeginner ( Options, "MercifulBeginner", false ), m_bMercifulBeginner ( Options, "MercifulBeginner", false ),
stepmania/src/PrefsManager.h
+1 -1
View File
@@ -99,7 +99,7 @@ public:
Preference<int> m_iMaxRegenComboAfterMiss; Preference<int> m_iMaxRegenComboAfterMiss;
Preference<bool> m_bTwoPlayerRecovery; Preference<bool> m_bTwoPlayerRecovery;
Preference<bool> m_bMercifulDrain; // negative life deltas are scaled by the players life percentage Preference<bool> m_bMercifulDrain; // negative life deltas are scaled by the players life percentage
Preference<bool> m_bMinimum1FullSongInCourses; // FEoS for 1st song, FailImmediate thereafter Preference<bool> m_bMinimum1FullSongInNonstop; // FEoS for 1st song, FailImmediate thereafter
Preference<bool> m_bFailOffInBeginner; Preference<bool> m_bFailOffInBeginner;
Preference<bool> m_bFailOffForFirstStageEasy; Preference<bool> m_bFailOffForFirstStageEasy;
Preference<bool> m_bMercifulBeginner; // don't subtract from percent score or grade DP, larger boo window Preference<bool> m_bMercifulBeginner; // don't subtract from percent score or grade DP, larger boo window