From 8863adb31a58d15f0374eef969300c8d300e92e2 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 2 Oct 2005 19:58:40 +0000 Subject: [PATCH] fix wrong song number displayed in nonstop if one player fails and the other doesn't --- stepmania/src/ScreenEvaluation.cpp | 2 +- stepmania/src/ScreenGameplay.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index b2221cf803..51bef82c37 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -439,7 +439,7 @@ void ScreenEvaluation::Init() m_textSurvivedNumber[p].SetShadowLength( 0 ); // curewater: edited the "# stages cleared" text so it deducts one if you failed. // Should be accurate, but I'm not sure if its "standard" that (bool)true = 1. (assumption) - m_textSurvivedNumber[p].SetText( ssprintf("%02d", STATSMAN->m_CurStageStats.m_player[p].iSongsPlayed - (int)STATSMAN->m_CurStageStats.m_player[p].bFailed) ); + m_textSurvivedNumber[p].SetText( ssprintf("%02d", STATSMAN->m_CurStageStats.m_player[p].iSongsPassed; m_textSurvivedNumber[p].SetName( ssprintf("SurvivedNumberP%d",p+1) ); SET_XY_AND_ON_COMMAND( m_textSurvivedNumber[p] ); this->AddChild( &m_textSurvivedNumber[p] ); diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 244d9d421d..c20093094c 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1065,7 +1065,7 @@ void ScreenGameplay::LoadNextSong() { pi->GetPlayerStageStats()->iSongsPlayed++; if( pi->m_ptextCourseSongNumber ) - pi->m_ptextCourseSongNumber->SetText( ssprintf("%d", pi->GetPlayerStageStats()->iSongsPlayed) ); + pi->m_ptextCourseSongNumber->SetText( ssprintf("%d", pi->GetPlayerStageStats()->iSongsPassed+1) ); } LoadCourseSongNumber( GAMESTATE->GetCourseSongIndex() );