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

fix battle stuff I broke earlier this week

Browse Source
This commit is contained in:
Chris Danford
2003-07-04 23:18:07 +00:00
parent bc06f43a83
commit 997b38f7b1
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CombinedLifeMeterEnemy.cpp
+6 -2
View File
@@ -32,14 +32,20 @@ CombinedLifeMeterEnemy::CombinedLifeMeterEnemy()
m_sprFace.Load( THEME->GetPathToG("CombinedLifeMeterEnemy face 2x3") ); m_sprFace.Load( THEME->GetPathToG("CombinedLifeMeterEnemy face 2x3") );
ASSERT( m_sprFace.GetNumStates() >= NUM_FACES ); ASSERT( m_sprFace.GetNumStates() >= NUM_FACES );
m_sprFace.StopAnimating(); m_sprFace.StopAnimating();
this->AddChild( &m_sprFace );
m_meterHealth.Load( THEME->GetPathToG("CombinedLifeMeterEnemy stream"), 464 ); m_meterHealth.Load( THEME->GetPathToG("CombinedLifeMeterEnemy stream"), 464 );
m_fLastSeenHealthPercent = -1; m_fLastSeenHealthPercent = -1;
this->AddChild( &m_meterHealth );
m_sprFrame.Load( THEME->GetPathToG("CombinedLifeMeterEnemy frame") );
this->AddChild( &m_sprFrame );
} }
void CombinedLifeMeterEnemy::Update( float fDelta ) void CombinedLifeMeterEnemy::Update( float fDelta )
{ {
CombinedLifeMeter::Update( fDelta );
if( m_fSecondsUntilReturnToNormalFace > 0 ) if( m_fSecondsUntilReturnToNormalFace > 0 )
{ {
m_fSecondsUntilReturnToNormalFace -= fDelta; m_fSecondsUntilReturnToNormalFace -= fDelta;
@@ -54,8 +60,6 @@ void CombinedLifeMeterEnemy::Update( float fDelta )
if( GAMESTATE->m_fOpponentHealthPercent == 0 ) if( GAMESTATE->m_fOpponentHealthPercent == 0 )
this->SetState( defeated ); this->SetState( defeated );
m_sprFace.Update( fDelta );
if( m_fLastSeenHealthPercent != GAMESTATE->m_fOpponentHealthPercent ) if( m_fLastSeenHealthPercent != GAMESTATE->m_fOpponentHealthPercent )
{ {
m_meterHealth.SetPercent( GAMESTATE->m_fOpponentHealthPercent ); m_meterHealth.SetPercent( GAMESTATE->m_fOpponentHealthPercent );
stepmania/src/CombinedLifeMeterEnemy.h
+2
View File
@@ -40,6 +40,8 @@ protected:
Sprite m_sprFace; Sprite m_sprFace;
float m_fSecondsUntilReturnToNormalFace; float m_fSecondsUntilReturnToNormalFace;
Sprite m_sprFrame;
}; };
stepmania/src/ScreenSelectMusic.cpp
+2 -2
View File
@@ -236,14 +236,14 @@ ScreenSelectMusic::~ScreenSelectMusic()
void ScreenSelectMusic::DrawPrimitives() void ScreenSelectMusic::DrawPrimitives()
{ {
// DISPLAY->LoadMenuPerspective(FOV); DISPLAY->LoadMenuPerspective(FOV);
m_Menu.DrawBottomLayer(); m_Menu.DrawBottomLayer();
Screen::DrawPrimitives(); Screen::DrawPrimitives();
m_Menu.DrawTopLayer(); m_Menu.DrawTopLayer();
m_sprOptionsMessage.Draw(); m_sprOptionsMessage.Draw();
// DISPLAY->LoadMenuPerspective(0); DISPLAY->LoadMenuPerspective(0);
} }
void ScreenSelectMusic::TweenOnScreen() void ScreenSelectMusic::TweenOnScreen()