diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index e8f86aefc2..20b1a5a9b7 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -327,11 +327,6 @@ ScreenGameplay::ScreenGameplay() } void ScreenGameplay::Init() -{ - Init( true ); -} - -void ScreenGameplay::Init( bool bUseSongBackgroundAndForeground ) { PLAYER_TYPE.Load( m_sName, "PlayerType" ); GIVE_UP_START_TEXT.Load( m_sName, "GiveUpStartText" ); @@ -345,7 +340,7 @@ void ScreenGameplay::Init( bool bUseSongBackgroundAndForeground ) FAIL_AFTER_30_MISSES.Load( m_sName, "FailAfter30Misses" ); ALLOW_CENTER_1_PLAYER.Load( m_sName, "AllowCenter1Player" ); - if( bUseSongBackgroundAndForeground ) + if( UseSongBackgroundAndForeground() ) { m_pSongBackground = new Background; m_pSongForeground = new Foreground; diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index b7ce4e61a9..3fb4329042 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -99,7 +99,6 @@ class ScreenGameplay : public ScreenWithMenuElements public: ScreenGameplay(); virtual void Init(); - void Init( bool bUseSongBackgroundAndForeground ); virtual ~ScreenGameplay(); virtual void BeginScreen(); @@ -122,6 +121,8 @@ protected: virtual bool GenericTweenOn() const { return true; } virtual bool GenericTweenOff() const { return true; } + virtual bool UseSongBackgroundAndForeground() const { return true; } + ThemeMetric PLAYER_TYPE; LocalizedString GIVE_UP_START_TEXT; LocalizedString GIVE_UP_BACK_TEXT; diff --git a/stepmania/src/ScreenGameplaySyncMachine.cpp b/stepmania/src/ScreenGameplaySyncMachine.cpp index 2808f5ef2c..a8c14189ae 100644 --- a/stepmania/src/ScreenGameplaySyncMachine.cpp +++ b/stepmania/src/ScreenGameplaySyncMachine.cpp @@ -30,7 +30,7 @@ void ScreenGameplaySyncMachine::Init() PREFSMAN->m_AutoPlay.Set( PC_HUMAN ); - ScreenGameplayNormal::Init( false ); + ScreenGameplayNormal::Init(); SO_GROUP_ASSIGN( GAMESTATE->m_SongOptions, ModsLevel_Stage, m_AutosyncType, SongOptions::AUTOSYNC_MACHINE ); diff --git a/stepmania/src/ScreenGameplaySyncMachine.h b/stepmania/src/ScreenGameplaySyncMachine.h index 0db5ff00e8..8435857926 100644 --- a/stepmania/src/ScreenGameplaySyncMachine.h +++ b/stepmania/src/ScreenGameplaySyncMachine.h @@ -19,6 +19,7 @@ public: void HandleScreenMessage( const ScreenMessage SM ); void ResetAndRestartCurrentSong(); protected: + virtual bool UseSongBackgroundAndForeground() const { return false; } void RefreshText(); Song m_Song;