From 4e7afa70fb9fbaad5bbda8cc4b0002b4199e34da Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sat, 16 Sep 2006 19:15:36 +0000 Subject: [PATCH] Use the course song index, not the stage index (which is always STAGE_1 rather than STAGE_ONI for some reason). --- stepmania/src/LifeMeterBattery.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmania/src/LifeMeterBattery.cpp b/stepmania/src/LifeMeterBattery.cpp index 72143ce67e..78d3026e1d 100644 --- a/stepmania/src/LifeMeterBattery.cpp +++ b/stepmania/src/LifeMeterBattery.cpp @@ -61,7 +61,7 @@ void LifeMeterBattery::Load( const PlayerState *pPlayerState, PlayerStageStats * Refresh(); } - +#include "RageLog.h" void LifeMeterBattery::OnSongEnded() { if( m_pPlayerStageStats->bFailedEarlier ) @@ -73,7 +73,7 @@ void LifeMeterBattery::OnSongEnded() PlayerNumber pn = m_pPlayerState->m_PlayerNumber; const Course *pCourse = GAMESTATE->m_pCurCourse; - if( pCourse && pCourse->m_vEntries[GAMESTATE->m_iCurrentStageIndex].iGainLives > -1 ) + if( pCourse && pCourse->m_vEntries[GAMESTATE->GetCourseSongIndex()].iGainLives > -1 ) m_iLivesLeft += pCourse->m_vEntries[GAMESTATE->m_iCurrentStageIndex].iGainLives; else m_iLivesLeft += ( GAMESTATE->m_pCurSteps[pn]->GetMeter()>=8 ? 2 : 1 );