We have:
LifeMeter->IsFailing()
-- whether the player would fail if a failure check was made right now
bFailedEarlier
-- whether the player was failing at some point
bFailed
-- whether the player actually failed
bFailedEarlier is set even in FailOff, but other than that the two
are identical. Most of the time, use bFailed; in FailOff, the player
should never fail, so bFailedEarlier should be meaningless.
This commit is contained in:
@@ -926,7 +926,7 @@ bool BackgroundImpl::IsDangerAllVisible()
|
||||
|
||||
/* Don't show it if everyone is already failing: it's already too late and it's
|
||||
* annoying for it to show for the entire duration of a song. */
|
||||
if( STATSMAN->m_CurStageStats.AllFailedEarlier() )
|
||||
if( STATSMAN->m_CurStageStats.AllFailed() )
|
||||
return false;
|
||||
|
||||
if( !GAMESTATE->AllAreInDangerOrWorse() )
|
||||
|
||||
@@ -73,7 +73,7 @@ void ScoreDisplayLifeTime::Update( float fDelta )
|
||||
|
||||
void ScoreDisplayLifeTime::OnLoadSong()
|
||||
{
|
||||
if( STATSMAN->m_CurStageStats.m_player[m_pPlayerState->m_PlayerNumber].bFailedEarlier )
|
||||
if( STATSMAN->m_CurStageStats.m_player[m_pPlayerState->m_PlayerNumber].bFailed )
|
||||
return;
|
||||
|
||||
Course* pCourse = GAMESTATE->m_pCurCourse;
|
||||
@@ -85,7 +85,7 @@ void ScoreDisplayLifeTime::OnLoadSong()
|
||||
|
||||
void ScoreDisplayLifeTime::OnJudgment( TapNoteScore tns )
|
||||
{
|
||||
if( STATSMAN->m_CurStageStats.m_player[m_pPlayerState->m_PlayerNumber].bFailedEarlier )
|
||||
if( STATSMAN->m_CurStageStats.m_player[m_pPlayerState->m_PlayerNumber].bFailed )
|
||||
return;
|
||||
|
||||
float fMeterChange = 0;
|
||||
@@ -106,7 +106,7 @@ void ScoreDisplayLifeTime::OnJudgment( TapNoteScore tns )
|
||||
|
||||
void ScoreDisplayLifeTime::OnJudgment( HoldNoteScore hns, TapNoteScore tns )
|
||||
{
|
||||
if( STATSMAN->m_CurStageStats.m_player[m_pPlayerState->m_PlayerNumber].bFailedEarlier )
|
||||
if( STATSMAN->m_CurStageStats.m_player[m_pPlayerState->m_PlayerNumber].bFailed )
|
||||
return;
|
||||
|
||||
float fMeterChange = 0;
|
||||
|
||||
@@ -281,7 +281,7 @@ void ScoreKeeperNormal::AddScore( TapNoteScore score )
|
||||
const int Z = m_iMaxPossiblePoints/10;
|
||||
|
||||
// Don't use a multiplier if the player has failed
|
||||
if( m_pPlayerStageStats->bFailedEarlier )
|
||||
if( m_pPlayerStageStats->bFailed )
|
||||
{
|
||||
iScore += p;
|
||||
// make score evenly divisible by 5
|
||||
@@ -305,7 +305,7 @@ void ScoreKeeperNormal::AddScore( TapNoteScore score )
|
||||
|
||||
if ( m_iTapNotesHit == m_iNumTapsAndHolds && score >= TNS_W2 )
|
||||
{
|
||||
if (!m_pPlayerStageStats->bFailedEarlier)
|
||||
if( !m_pPlayerStageStats->bFailed )
|
||||
iScore += m_iPointBonus;
|
||||
if ( m_bIsLastSongInCourse )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user