oops, missed one.

This commit is contained in:
Steve Checkoway
2006-09-16 19:56:00 +00:00
parent ba8b31a1cf
commit 420846a012
+3 -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 )
@@ -74,10 +74,11 @@ void LifeMeterBattery::OnSongEnded()
const Course *pCourse = GAMESTATE->m_pCurCourse; const Course *pCourse = GAMESTATE->m_pCurCourse;
if( pCourse && pCourse->m_vEntries[GAMESTATE->GetCourseSongIndex()].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->GetCourseSongIndex()].iGainLives;
else else
m_iLivesLeft += ( GAMESTATE->m_pCurSteps[pn]->GetMeter()>=8 ? 2 : 1 ); m_iLivesLeft += ( GAMESTATE->m_pCurSteps[pn]->GetMeter()>=8 ? 2 : 1 );
m_iLivesLeft = min( m_iLivesLeft, GAMESTATE->m_SongOptions.GetSong().m_iBatteryLives ); m_iLivesLeft = min( m_iLivesLeft, GAMESTATE->m_SongOptions.GetSong().m_iBatteryLives );
if( m_iTrailingLivesLeft < m_iLivesLeft ) if( m_iTrailingLivesLeft < m_iLivesLeft )
m_soundGainLife.Play(); m_soundGainLife.Play();
} }