Fixed articts in hold note and life frames.

This commit is contained in:
Chris Danford
2002-10-18 19:01:32 +00:00
parent 1c955f47f6
commit 15fc589cc6
16 changed files with 217 additions and 99 deletions
+12 -12
View File
@@ -183,6 +183,18 @@ ScreenGameplay::ScreenGameplay()
m_sprMiddleFrame.SetXY( MIDDLE_FRAME_X, MIDDLE_FRAME_Y );
// LifeFrame goes below LifeMeter
CString sLifeFrameName;
if( bExtra )
sLifeFrameName = "gameplay extra life frame";
else if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY )
sLifeFrameName = "gameplay oni life frame";
else
sLifeFrameName = "gameplay life frame";
m_sprLifeFrame.Load( THEME->GetPathTo("Graphics",sLifeFrameName) );
m_sprLifeFrame.SetXY( LIFE_FRAME_X, LIFE_FRAME_Y(bExtra) );
this->AddChild( &m_sprLifeFrame );
for( p=0; p<NUM_PLAYERS; p++ )
{
switch( GAMESTATE->m_SongOptions.m_LifeType )
@@ -202,18 +214,6 @@ ScreenGameplay::ScreenGameplay()
this->AddChild( m_pLifeMeter[p] );
}
// LifeFrame goes above LifeMeter
CString sLifeFrameName;
if( bExtra )
sLifeFrameName = "gameplay extra life frame";
else if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY )
sLifeFrameName = "gameplay oni life frame";
else
sLifeFrameName = "gameplay life frame";
m_sprLifeFrame.Load( THEME->GetPathTo("Graphics",sLifeFrameName) );
m_sprLifeFrame.SetXY( LIFE_FRAME_X, LIFE_FRAME_Y(bExtra) );
this->AddChild( &m_sprLifeFrame );
m_textStageNumber.LoadFromFont( THEME->GetPathTo("Fonts","gameplay stage") );
m_textStageNumber.TurnShadowOff();