diff --git a/stepmania/src/CombinedLifeMeterEnemy.cpp b/stepmania/src/CombinedLifeMeterEnemy.cpp index 1d2e56782d..44f205d6f2 100644 --- a/stepmania/src/CombinedLifeMeterEnemy.cpp +++ b/stepmania/src/CombinedLifeMeterEnemy.cpp @@ -32,14 +32,20 @@ CombinedLifeMeterEnemy::CombinedLifeMeterEnemy() m_sprFace.Load( THEME->GetPathToG("CombinedLifeMeterEnemy face 2x3") ); ASSERT( m_sprFace.GetNumStates() >= NUM_FACES ); m_sprFace.StopAnimating(); + this->AddChild( &m_sprFace ); m_meterHealth.Load( THEME->GetPathToG("CombinedLifeMeterEnemy stream"), 464 ); m_fLastSeenHealthPercent = -1; + this->AddChild( &m_meterHealth ); + m_sprFrame.Load( THEME->GetPathToG("CombinedLifeMeterEnemy frame") ); + this->AddChild( &m_sprFrame ); } void CombinedLifeMeterEnemy::Update( float fDelta ) { + CombinedLifeMeter::Update( fDelta ); + if( m_fSecondsUntilReturnToNormalFace > 0 ) { m_fSecondsUntilReturnToNormalFace -= fDelta; @@ -54,8 +60,6 @@ void CombinedLifeMeterEnemy::Update( float fDelta ) if( GAMESTATE->m_fOpponentHealthPercent == 0 ) this->SetState( defeated ); - m_sprFace.Update( fDelta ); - if( m_fLastSeenHealthPercent != GAMESTATE->m_fOpponentHealthPercent ) { m_meterHealth.SetPercent( GAMESTATE->m_fOpponentHealthPercent ); diff --git a/stepmania/src/CombinedLifeMeterEnemy.h b/stepmania/src/CombinedLifeMeterEnemy.h index 708545acd9..64f625e4cc 100644 --- a/stepmania/src/CombinedLifeMeterEnemy.h +++ b/stepmania/src/CombinedLifeMeterEnemy.h @@ -40,6 +40,8 @@ protected: Sprite m_sprFace; float m_fSecondsUntilReturnToNormalFace; + + Sprite m_sprFrame; }; diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 3df13bf634..21c2cf65ff 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -236,14 +236,14 @@ ScreenSelectMusic::~ScreenSelectMusic() void ScreenSelectMusic::DrawPrimitives() { -// DISPLAY->LoadMenuPerspective(FOV); + DISPLAY->LoadMenuPerspective(FOV); m_Menu.DrawBottomLayer(); Screen::DrawPrimitives(); m_Menu.DrawTopLayer(); m_sprOptionsMessage.Draw(); -// DISPLAY->LoadMenuPerspective(0); + DISPLAY->LoadMenuPerspective(0); } void ScreenSelectMusic::TweenOnScreen()