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

FailAfter30Misses -> FailOnMissCombo

Browse Source
This commit is contained in:
Glenn Maynard
2007-05-30 20:22:57 +00:00
parent 391b708820
commit 9b8ef44337
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+4 -4
View File
@@ -346,7 +346,7 @@ void ScreenGameplay::Init()
START_GIVES_UP.Load( m_sName, "StartGivesUp" ); START_GIVES_UP.Load( m_sName, "StartGivesUp" );
BACK_GIVES_UP.Load( m_sName, "BackGivesUp" ); BACK_GIVES_UP.Load( m_sName, "BackGivesUp" );
GIVING_UP_GOES_TO_PREV_SCREEN.Load( m_sName, "GivingUpGoesToPrevScreen" ); GIVING_UP_GOES_TO_PREV_SCREEN.Load( m_sName, "GivingUpGoesToPrevScreen" );
FAIL_AFTER_30_MISSES.Load( m_sName, "FailAfter30Misses" ); FAIL_ON_MISS_COMBO.Load( m_sName, "FailOnMissCombo" );
ALLOW_CENTER_1_PLAYER.Load( m_sName, "AllowCenter1Player" ); ALLOW_CENTER_1_PLAYER.Load( m_sName, "AllowCenter1Player" );
if( UseSongBackgroundAndForeground() ) if( UseSongBackgroundAndForeground() )
@@ -1722,13 +1722,13 @@ void ScreenGameplay::Update( float fDeltaTime )
// update give up // update give up
// //
bool bGiveUpTimerFired = !m_GiveUpTimer.IsZero() && m_GiveUpTimer.Ago() > 2.5f; bool bGiveUpTimerFired = !m_GiveUpTimer.IsZero() && m_GiveUpTimer.Ago() > 2.5f;
bool bAllHumanHaveComboOf30OrMoreMisses = STATSMAN->m_CurStageStats.GetMinimumMissCombo() >= 30; bool bAllHumanHaveBigMissCombo = FAIL_ON_MISS_COMBO.GetValue() != -1 && STATSMAN->m_CurStageStats.GetMinimumMissCombo() >= FAIL_ON_MISS_COMBO;
if( bGiveUpTimerFired || (FAIL_AFTER_30_MISSES && bAllHumanHaveComboOf30OrMoreMisses) ) if( bGiveUpTimerFired || bAllHumanHaveBigMissCombo )
{ {
STATSMAN->m_CurStageStats.m_bGaveUp = true; STATSMAN->m_CurStageStats.m_bGaveUp = true;
FOREACH_EnabledPlayerNumberInfo( m_vPlayerInfo, pi ) FOREACH_EnabledPlayerNumberInfo( m_vPlayerInfo, pi )
{ {
pi->GetPlayerStageStats()->m_bFailed |= bAllHumanHaveComboOf30OrMoreMisses; pi->GetPlayerStageStats()->m_bFailed |= bAllHumanHaveBigMissCombo;
pi->GetPlayerStageStats()->m_bDisqualified = true; pi->GetPlayerStageStats()->m_bDisqualified = true;
} }
stepmania/src/ScreenGameplay.h
+1 -1
View File
@@ -148,7 +148,7 @@ protected:
ThemeMetric<bool> START_GIVES_UP; ThemeMetric<bool> START_GIVES_UP;
ThemeMetric<bool> BACK_GIVES_UP; ThemeMetric<bool> BACK_GIVES_UP;
ThemeMetric<bool> GIVING_UP_GOES_TO_PREV_SCREEN; ThemeMetric<bool> GIVING_UP_GOES_TO_PREV_SCREEN;
ThemeMetric<bool> FAIL_AFTER_30_MISSES; ThemeMetric<int> FAIL_ON_MISS_COMBO;
ThemeMetric<bool> ALLOW_CENTER_1_PLAYER; ThemeMetric<bool> ALLOW_CENTER_1_PLAYER;
bool IsLastSong(); bool IsLastSong();