From a72131f0b03faaaf1002ab2402d57d8730bb4bea Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 12 May 2007 23:51:56 +0000 Subject: [PATCH] easier fail mode only for each player's first stage; don't give it to everyone for everyone else's first --- stepmania/src/GameState.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 77bdb4436a..6a8336d255 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -1314,23 +1314,20 @@ PlayerOptions::FailType GameState::GetPlayerFailType( const PlayerState *pPlayer if( m_pCurSteps[pn] ) dc = m_pCurSteps[pn]->GetDifficulty(); - bool bFirstStageForAny = false; + bool bFirstStage = false; if( !IsEventMode() ) - { - FOREACH_HumanPlayer( p ) - bFirstStageForAny |= m_iPlayerStageTokens[p] == PREFSMAN->m_iSongsPerPlay-1; // HACK; -1 because this is called during gameplay - } + bFirstStage |= m_iPlayerStageTokens[pPlayerState->m_PlayerNumber] == PREFSMAN->m_iSongsPerPlay-1; // HACK; -1 because this is called during gameplay /* Easy and beginner are never harder than FAIL_IMMEDIATE_CONTINUE. */ if( dc <= Difficulty_Easy ) setmax( ft, PlayerOptions::FAIL_IMMEDIATE_CONTINUE ); - if( dc <= Difficulty_Easy && bFirstStageForAny && PREFSMAN->m_bFailOffForFirstStageEasy ) + if( dc <= Difficulty_Easy && bFirstStage && PREFSMAN->m_bFailOffForFirstStageEasy ) setmax( ft, PlayerOptions::FAIL_OFF ); /* If beginner's steps were chosen, and this is the first stage, * turn off failure completely. */ - if( dc == Difficulty_Beginner && bFirstStageForAny ) + if( dc == Difficulty_Beginner && bFirstStage ) setmax( ft, PlayerOptions::FAIL_OFF ); if( dc == Difficulty_Beginner && PREFSMAN->m_bFailOffInBeginner )