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

fix initial LifeChanged not sent; simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-14 20:45:29 +00:00
parent f198df8e3e
commit 7fcc68edda
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LifeMeterBar.cpp
+3 -5
View File
@@ -110,8 +110,6 @@ LifeMeterBar::LifeMeterBar()
m_sprFrame.Load( THEME->GetPathG(sType,sExtra+"frame") ); m_sprFrame.Load( THEME->GetPathG(sType,sExtra+"frame") );
m_sprFrame->SetName( "Frame" ); m_sprFrame->SetName( "Frame" );
this->AddChild( m_sprFrame ); this->AddChild( m_sprFrame );
AfterLifeChanged();
} }
LifeMeterBar::~LifeMeterBar() LifeMeterBar::~LifeMeterBar()
@@ -136,6 +134,8 @@ void LifeMeterBar::Load( const PlayerState *pPlayerState, PlayerStageStats *pPla
m_fBaseLifeDifficulty = 5.0f; m_fBaseLifeDifficulty = 5.0f;
m_fLifeDifficulty = m_fBaseLifeDifficulty; m_fLifeDifficulty = m_fBaseLifeDifficulty;
} }
AfterLifeChanged();
} }
void LifeMeterBar::ChangeLife( TapNoteScore score ) void LifeMeterBar::ChangeLife( TapNoteScore score )
@@ -260,13 +260,11 @@ void LifeMeterBar::ChangeLife( float fDeltaLife )
void LifeMeterBar::AfterLifeChanged() void LifeMeterBar::AfterLifeChanged()
{ {
m_pStream->SetPercent( m_fLifePercentage ); m_pStream->SetPercent( m_fLifePercentage );
if( m_pPlayerState )
{
Message msg( "LifeChanged" ); Message msg( "LifeChanged" );
msg.SetParam( "Player", m_pPlayerState->m_PlayerNumber ); msg.SetParam( "Player", m_pPlayerState->m_PlayerNumber );
msg.SetParam( "LifeMeter", LuaReference::CreateFromPush(*this) ); msg.SetParam( "LifeMeter", LuaReference::CreateFromPush(*this) );
MESSAGEMAN->Broadcast( msg ); MESSAGEMAN->Broadcast( msg );
}
} }
bool LifeMeterBar::IsHot() const bool LifeMeterBar::IsHot() const