diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index fd4bbdb5e4..a9f2429c92 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -422,12 +422,6 @@ void ScreenGameplay::Init() this->AddChild( &m_textSongTitle ); - m_meterSongPosition.Load( THEME->GetPathG(m_sName,"song position meter"), SONG_POSITION_METER_WIDTH, THEME->GetPathG(m_sName,"song position tip") ); - m_meterSongPosition.SetName( "SongPositionMeter" ); - SET_XY( m_meterSongPosition ); - this->AddChild( &m_meterSongPosition ); - - m_MaxCombo.LoadFromFont( THEME->GetPathF(m_sName,"max combo") ); m_MaxCombo.SetName( "MaxCombo" ); SET_XY( m_MaxCombo ); @@ -2392,7 +2386,6 @@ void ScreenGameplay::TweenOnScreen() ON_COMMAND( m_textSongOptions ); ON_COMMAND( m_sprScoreFrame ); ON_COMMAND( m_textSongTitle ); - ON_COMMAND( m_meterSongPosition ); ON_COMMAND( m_BPMDisplay ); ON_COMMAND( m_MaxCombo ); @@ -2420,7 +2413,8 @@ void ScreenGameplay::TweenOnScreen() FOREACH_NSScoreBoardColumn( sc ) ON_COMMAND( m_Scoreboard[sc] ); - m_Overlay->PlayCommand("On"); + if( m_Overlay.IsLoaded() ) + m_Overlay->PlayCommand("On"); } void ScreenGameplay::TweenOffScreen() @@ -2432,7 +2426,6 @@ void ScreenGameplay::TweenOffScreen() OFF_COMMAND( m_textSongOptions ); OFF_COMMAND( m_sprScoreFrame ); OFF_COMMAND( m_textSongTitle ); - OFF_COMMAND( m_meterSongPosition ); OFF_COMMAND( m_BPMDisplay ); OFF_COMMAND( m_MaxCombo ); diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 6eca8e1caa..11ea0fce51 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -22,7 +22,6 @@ class Inventory; #include "LyricDisplay.h" #include "Character.h" #include "Attack.h" -#include "MeterDisplay.h" #include "ActiveAttackList.h" #include "NetworkSyncManager.h" #include "AutoKeysounds.h" @@ -134,7 +133,6 @@ protected: BitmapText m_textSurviveTime; // used in extra stage BitmapText m_textSongTitle; - SongMeterDisplay m_meterSongPosition; Player m_Player[NUM_PLAYERS];