Fixes to Extra Stage
This commit is contained in:
@@ -34,24 +34,6 @@ LifeMeterBattery::LifeMeterBattery()
|
||||
|
||||
m_fBatteryBlinkTime = 0;
|
||||
|
||||
m_sprFrame.Load( THEME->GetPathTo(GRAPHIC_GAMEPLAY_LIFEMETER_ONI) );
|
||||
this->AddSubActor( &m_sprFrame );
|
||||
|
||||
m_sprBattery.Load( THEME->GetPathTo(GRAPHIC_GAMEPLAY_LIFEMETER_BATTERY) );
|
||||
m_sprBattery.StopAnimating();
|
||||
this->AddSubActor( &m_sprBattery );
|
||||
|
||||
m_textNumLives.Load( THEME->GetPathTo(FONT_HEADER1) );
|
||||
m_textNumLives.SetDiffuseColor( D3DXCOLOR(1,1,1,1) ); // pink
|
||||
m_textNumLives.SetZoom( 1.1f );
|
||||
m_textNumLives.TurnShadowOff();
|
||||
this->AddSubActor( &m_textNumLives );
|
||||
|
||||
m_textPercent.Load( THEME->GetPathTo(FONT_SCORE_NUMBERS) );
|
||||
m_textPercent.TurnShadowOff();
|
||||
m_textPercent.SetZoom( 0.7f );
|
||||
m_textPercent.SetText( "00.0" );
|
||||
this->AddSubActor( &m_textPercent );
|
||||
|
||||
m_soundGainLife.Load( THEME->GetPathTo(SOUND_GAMEPLAY_ONI_GAIN_LIFE) );
|
||||
m_soundLoseLife.Load( THEME->GetPathTo(SOUND_GAMEPLAY_ONI_LOSE_LIFE) );
|
||||
@@ -63,6 +45,32 @@ void LifeMeterBattery::Load( PlayerNumber pn )
|
||||
{
|
||||
LifeMeter::Load( pn );
|
||||
|
||||
bool bPlayerEnabled = GAMESTATE->IsPlayerEnabled(pn);
|
||||
|
||||
m_sprFrame.Load( THEME->GetPathTo(GRAPHIC_GAMEPLAY_LIFEMETER_ONI) );
|
||||
this->AddSubActor( &m_sprFrame );
|
||||
|
||||
m_sprBattery.Load( THEME->GetPathTo(GRAPHIC_GAMEPLAY_LIFEMETER_BATTERY) );
|
||||
m_sprBattery.StopAnimating();
|
||||
if( bPlayerEnabled )
|
||||
this->AddSubActor( &m_sprBattery );
|
||||
|
||||
m_textNumLives.Load( THEME->GetPathTo(FONT_HEADER1) );
|
||||
m_textNumLives.SetDiffuseColor( D3DXCOLOR(1,1,1,1) ); // pink
|
||||
m_textNumLives.SetZoom( 1.1f );
|
||||
m_textNumLives.TurnShadowOff();
|
||||
if( bPlayerEnabled )
|
||||
this->AddSubActor( &m_textNumLives );
|
||||
|
||||
m_textPercent.Load( THEME->GetPathTo(FONT_SCORE_NUMBERS) );
|
||||
m_textPercent.TurnShadowOff();
|
||||
m_textPercent.SetZoom( 0.7f );
|
||||
m_textPercent.SetText( "00.0" );
|
||||
if( bPlayerEnabled )
|
||||
this->AddSubActor( &m_textPercent );
|
||||
|
||||
|
||||
|
||||
m_sprFrame.SetZoomX( pn==PLAYER_1 ? 1.0f : -1.0f );
|
||||
m_sprBattery.SetZoomX( pn==PLAYER_1 ? 1.0f : -1.0f );
|
||||
m_sprBattery.SetX( BATTERY_X[pn] );
|
||||
|
||||
Reference in New Issue
Block a user