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

use same fail logic for Oni as for Nonstop

Browse Source
This commit is contained in:
Chris Danford
2005-06-16 22:09:03 +00:00
parent ed440fa648
commit 8a2334b4bf
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
@@ -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
stepmania/src/PrefsManager.cpp
+1 -1
View File
@@ -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 ),
stepmania/src/PrefsManager.h
+1 -1
View File
@@ -100,7 +100,7 @@ public:
Preference<int> m_iMaxRegenComboAfterMiss;
Preference<bool> m_bTwoPlayerRecovery;
Preference<bool> m_bMercifulDrain; // negative life deltas are scaled by the players life percentage
Preference<bool> m_bMinimum1FullSongInNonstop; // FEoS for 1st song, FailImmediate thereafter
Preference<bool> m_bMinimum1FullSongInCourses; // FEoS for 1st song, FailImmediate thereafter
Preference<bool> m_bFailOffInBeginner;
Preference<bool> m_bFailOffForFirstStageEasy;
Preference<bool> m_bMercifulBeginner; // don't subtract from percent score or grade DP, larger boo window