From f14bad21254ae4598ceb0d882b97a4fdb232476f Mon Sep 17 00:00:00 2001 From: Andrew Wong Date: Fri, 8 Aug 2003 11:26:35 +0000 Subject: [PATCH] fix lifebar difficulty being a final stage on demonstration/jukebox modes --- stepmania/src/ScreenGameplay.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 028ebf55b5..4d2cf68283 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -704,7 +704,7 @@ void ScreenGameplay::LoadNextSong() if( GAMESTATE->m_SongOptions.m_LifeType==SongOptions::LIFE_BATTERY && GAMESTATE->m_CurStageStats.bFailed[p] ) // already failed ShowOniGameOver((PlayerNumber)p); - if( GAMESTATE->m_SongOptions.m_LifeType==SongOptions::LIFE_BAR && GAMESTATE->m_PlayMode == PLAY_MODE_ARCADE && !PREFSMAN->m_bEventMode ) + if( GAMESTATE->m_SongOptions.m_LifeType==SongOptions::LIFE_BAR && GAMESTATE->m_PlayMode == PLAY_MODE_ARCADE && !PREFSMAN->m_bEventMode && !m_bDemonstration) { m_pLifeMeter[p]->UpdateNonstopLifebar( GAMESTATE->GetStageIndex(), @@ -713,9 +713,6 @@ void ScreenGameplay::LoadNextSong() } if( GAMESTATE->m_SongOptions.m_LifeType==SongOptions::LIFE_BAR && GAMESTATE->m_PlayMode == PLAY_MODE_NONSTOP ) { - LOG->Trace("Song %d of %d", - GAMESTATE->GetCourseSongIndex(), - GAMESTATE->m_pCurCourse->GetEstimatedNumStages() ); m_pLifeMeter[p]->UpdateNonstopLifebar( GAMESTATE->GetCourseSongIndex(), GAMESTATE->m_pCurCourse->GetEstimatedNumStages(),