actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* style fix

Browse Source 
* difference can be calculated in SendLifeChangedMessage
This commit is contained in:
Vecais Dumais Laacis
2007-08-08 08:44:42 +00:00
parent 76b22d11ac
commit f69381d388
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LifeMeterTime.cpp
+6 -6
View File
@@ -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 );
}