From 0b1031732e8dcf29b5e404d19a4539d2fbddf592 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 9 May 2005 15:14:19 +0000 Subject: [PATCH] give up if all human players have 30 misses so that battle will end early --- stepmania/src/ScreenGameplay.cpp | 7 +++++-- stepmania/src/ScreenGameplay.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index ab5924c1cb..671b3fb350 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -99,7 +99,7 @@ ScreenGameplay::ScreenGameplay( CString sName ) : ScreenWithMenuElements(sName) BACK_GIVES_UP.Load( sName, "BackGivesUp" ); GIVING_UP_GOES_TO_PREV_SCREEN.Load( sName, "GivingUpGoesToPrevScreen" ); GIVING_UP_GOES_TO_NEXT_SCREEN.Load( sName, "GivingUpGoesToNextScreen" ); - GIVE_UP_AFTER_30_MISSES.Load( sName, "GiveUpAfter30Misses" ); + FAIL_AFTER_30_MISSES.Load( sName, "FailAfter30Misses" ); USE_FORCED_MODIFIERS_IN_BEGINNER.Load( sName, "UseForcedModifiersInBeginner" ); FORCED_MODIFIERS_IN_BEGINNER.Load( sName, "ForcedModifiersInBeginner" ); } @@ -1594,12 +1594,15 @@ void ScreenGameplay::Update( float fDeltaTime ) // update give up // bool bGiveUpTimerFired = !m_GiveUpTimer.IsZero() && m_GiveUpTimer.Ago() > 2.5f; - if( bGiveUpTimerFired || GAMESTATE->AllHumanHaveComboOf30OrMoreMisses() ) + if( bGiveUpTimerFired || (FAIL_AFTER_30_MISSES && GAMESTATE->AllHumanHaveComboOf30OrMoreMisses()) ) { // Give up FOREACH_PlayerNumber( p ) + { STATSMAN->m_CurStageStats.m_player[p].bGaveUp = true; + STATSMAN->m_CurStageStats.m_player[p].bFailed = GAMESTATE->AllHumanHaveComboOf30OrMoreMisses(); + } m_GiveUpTimer.SetZero(); diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 8d5cd349af..5fcd9a4493 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -52,7 +52,7 @@ protected: ThemeMetric BACK_GIVES_UP; ThemeMetric GIVING_UP_GOES_TO_PREV_SCREEN; ThemeMetric GIVING_UP_GOES_TO_NEXT_SCREEN; - ThemeMetric GIVE_UP_AFTER_30_MISSES; + ThemeMetric FAIL_AFTER_30_MISSES; ThemeMetric USE_FORCED_MODIFIERS_IN_BEGINNER; ThemeMetric FORCED_MODIFIERS_IN_BEGINNER;