Use the course song index, not the stage index (which is always STAGE_1 rather than STAGE_ONI for some reason).

This commit is contained in:
Steve Checkoway
2006-09-16 19:15:36 +00:00
parent 6051deb2a8
commit 4e7afa70fb
+2 -2
View File
@@ -61,7 +61,7 @@ void LifeMeterBattery::Load( const PlayerState *pPlayerState, PlayerStageStats *
Refresh(); Refresh();
} }
#include "RageLog.h"
void LifeMeterBattery::OnSongEnded() void LifeMeterBattery::OnSongEnded()
{ {
if( m_pPlayerStageStats->bFailedEarlier ) if( m_pPlayerStageStats->bFailedEarlier )
@@ -73,7 +73,7 @@ void LifeMeterBattery::OnSongEnded()
PlayerNumber pn = m_pPlayerState->m_PlayerNumber; PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
const Course *pCourse = GAMESTATE->m_pCurCourse; 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; m_iLivesLeft += pCourse->m_vEntries[GAMESTATE->m_iCurrentStageIndex].iGainLives;
else else
m_iLivesLeft += ( GAMESTATE->m_pCurSteps[pn]->GetMeter()>=8 ? 2 : 1 ); m_iLivesLeft += ( GAMESTATE->m_pCurSteps[pn]->GetMeter()>=8 ? 2 : 1 );