diff --git a/stepmania/src/LifeMeterTime.cpp b/stepmania/src/LifeMeterTime.cpp index 6c86eae191..5803803765 100644 --- a/stepmania/src/LifeMeterTime.cpp +++ b/stepmania/src/LifeMeterTime.cpp @@ -97,7 +97,7 @@ void LifeMeterTime::Load( const PlayerState *pPlayerState, PlayerStageStats *pPl void LifeMeterTime::OnLoadSong() { - if( ( GetLifeSeconds() <= 0 ) && ( GAMESTATE->GetCourseSongIndex() > 0 ) ) + if( GetLifeSeconds() <= 0 && GAMESTATE->GetCourseSongIndex() > 0 ) { return; } @@ -111,7 +111,7 @@ void LifeMeterTime::OnLoadSong() m_soundGainLife.Play(); - SendLifeChangedMessage( fOldLife, TapNoteScore_Invalid, HoldNoteScore_Invalid, pCourse->m_vEntries[GAMESTATE->GetCourseSongIndex()].fGainSeconds ); + SendLifeChangedMessage( fOldLife, TapNoteScore_Invalid, HoldNoteScore_Invalid ); } @@ -139,7 +139,7 @@ void LifeMeterTime::ChangeLife( TapNoteScore tns ) m_fLifeTotalLostSeconds -= fMeterChange; - SendLifeChangedMessage( fOldLife, tns, HoldNoteScore_Invalid, fMeterChange ); + SendLifeChangedMessage( fOldLife, tns, HoldNoteScore_Invalid ); } void LifeMeterTime::ChangeLife( HoldNoteScore hns, TapNoteScore tns ) @@ -159,7 +159,7 @@ void LifeMeterTime::ChangeLife( HoldNoteScore hns, TapNoteScore tns ) m_fLifeTotalLostSeconds -= fMeterChange; - SendLifeChangedMessage( fOldLife, tns, hns, fMeterChange ); + SendLifeChangedMessage( fOldLife, tns, hns ); } void LifeMeterTime::HandleTapScoreNone() @@ -167,14 +167,14 @@ void LifeMeterTime::HandleTapScoreNone() } -void LifeMeterTime::SendLifeChangedMessage( float fOldLife, TapNoteScore tns, HoldNoteScore hns, float fDifference ) +void LifeMeterTime::SendLifeChangedMessage( float fOldLife, TapNoteScore tns, HoldNoteScore hns ) { Message msg( "LifeChanged" ); msg.SetParam( "Player", m_pPlayerState->m_PlayerNumber ); msg.SetParam( "TapNoteScore", LuaReference::Create(tns) ); msg.SetParam( "HoldNoteScore", LuaReference::Create(hns) ); msg.SetParam( "OldLife", fOldLife ); - msg.SetParam( "Difference", fDifference ); + msg.SetParam( "Difference", fOldLife - m_fLifeTotalLostSeconds ); msg.SetParam( "LifeMeter", LuaReference::CreateFromPush(*this) ); MESSAGEMAN->Broadcast( msg ); } diff --git a/stepmania/src/LifeMeterTime.h b/stepmania/src/LifeMeterTime.h index 8d8597828e..8c1b27644d 100644 --- a/stepmania/src/LifeMeterTime.h +++ b/stepmania/src/LifeMeterTime.h @@ -33,7 +33,7 @@ public: private: float GetLifeSeconds() const; - void SendLifeChangedMessage( float fOldLife, TapNoteScore tns, HoldNoteScore hns, float fDifference ); + void SendLifeChangedMessage( float fOldLife, TapNoteScore tns, HoldNoteScore hns ); AutoActor m_sprBackground; Quad m_quadDangerGlow;