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

give up if all human players have 30 misses so that battle will end early

Browse Source
This commit is contained in:
Chris Danford
2005-05-09 15:14:19 +00:00
parent 856a6a2ab1
commit 0b1031732e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+5 -2
View File
@@ -99,7 +99,7 @@ ScreenGameplay::ScreenGameplay( CString sName ) : ScreenWithMenuElements(sName)
BACK_GIVES_UP.Load( sName, "BackGivesUp" ); BACK_GIVES_UP.Load( sName, "BackGivesUp" );
GIVING_UP_GOES_TO_PREV_SCREEN.Load( sName, "GivingUpGoesToPrevScreen" ); GIVING_UP_GOES_TO_PREV_SCREEN.Load( sName, "GivingUpGoesToPrevScreen" );
GIVING_UP_GOES_TO_NEXT_SCREEN.Load( sName, "GivingUpGoesToNextScreen" ); 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" ); USE_FORCED_MODIFIERS_IN_BEGINNER.Load( sName, "UseForcedModifiersInBeginner" );
FORCED_MODIFIERS_IN_BEGINNER.Load( sName, "ForcedModifiersInBeginner" ); FORCED_MODIFIERS_IN_BEGINNER.Load( sName, "ForcedModifiersInBeginner" );
} }
@@ -1594,12 +1594,15 @@ 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;
if( bGiveUpTimerFired || GAMESTATE->AllHumanHaveComboOf30OrMoreMisses() ) if( bGiveUpTimerFired || (FAIL_AFTER_30_MISSES && GAMESTATE->AllHumanHaveComboOf30OrMoreMisses()) )
{ {
// Give up // Give up
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
{
STATSMAN->m_CurStageStats.m_player[p].bGaveUp = true; STATSMAN->m_CurStageStats.m_player[p].bGaveUp = true;
STATSMAN->m_CurStageStats.m_player[p].bFailed = GAMESTATE->AllHumanHaveComboOf30OrMoreMisses();
}
m_GiveUpTimer.SetZero(); m_GiveUpTimer.SetZero();
stepmania/src/ScreenGameplay.h
+1 -1
View File
@@ -52,7 +52,7 @@ protected:
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> GIVING_UP_GOES_TO_NEXT_SCREEN; ThemeMetric<bool> GIVING_UP_GOES_TO_NEXT_SCREEN;
ThemeMetric<bool> GIVE_UP_AFTER_30_MISSES; ThemeMetric<bool> FAIL_AFTER_30_MISSES;
ThemeMetric<bool> USE_FORCED_MODIFIERS_IN_BEGINNER; ThemeMetric<bool> USE_FORCED_MODIFIERS_IN_BEGINNER;
ThemeMetric<CString> FORCED_MODIFIERS_IN_BEGINNER; ThemeMetric<CString> FORCED_MODIFIERS_IN_BEGINNER;