From 3f6199b84aa540d75ae1b10eb5570505cd4f523c Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 5 Feb 2006 05:50:38 +0000 Subject: [PATCH] make ScreenGameplay use a background, but blank it --- stepmania/Themes/default/metrics.ini | 6 ++++++ stepmania/src/Screen.h | 1 - stepmania/src/ScreenGameplay.h | 1 - stepmania/src/ScreenManager.cpp | 8 ++------ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 7097a7c79d..dbc2357c4d 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -4634,6 +4634,12 @@ LifeP2OnCommand=hidden,1 ScoreP1OnCommand=hidden,1 ScoreP2OnCommand=hidden,1 StageOnCommand=hidden,1 +ScoreFrameOnCommand=hidden,1 +LifeFrameOnCommand=hidden,1 +DifficultyP1OnCommand=hidden,1 +DifficultyP1ReverseOnCommand=hidden,1 +DifficultyP2OnCommand=hidden,1 +DifficultyP2ReverseOnCommand=hidden,1 [PlayerScoreItem Percent] Fallback=ScoreDisplayPercentage Percent diff --git a/stepmania/src/Screen.h b/stepmania/src/Screen.h index 8fb9e0ca44..65901a7ec2 100644 --- a/stepmania/src/Screen.h +++ b/stepmania/src/Screen.h @@ -54,7 +54,6 @@ public: void ClearMessageQueue(); void ClearMessageQueue( const ScreenMessage SM ); // clear of a specific SM - virtual bool UsesBackground() const { return true; } // override and set false if this screen shouldn't load a background virtual ScreenType GetScreenType() const { return ALLOW_OPERATOR_MENU_BUTTON ? game_menu : system_menu; } bool AllowOperatorMenuButton() const { return ALLOW_OPERATOR_MENU_BUTTON; } diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 5140b80375..00ae039731 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -108,7 +108,6 @@ public: virtual void HandleScreenMessage( const ScreenMessage SM ); virtual void Cancel( ScreenMessage smSendWhenDone ); - virtual bool UsesBackground() const { return false; } virtual ScreenType GetScreenType() const { return gameplay; } // diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index a5d4dfb5f7..a0e6d671af 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -526,9 +526,7 @@ void ScreenManager::PrepareScreen( const RString &sScreenName ) /* Don't delete previously prepared versions of the screen's background, * and only prepare it if it's different than the current background * and not already loaded. */ - RString sNewBGA; - if( pNewScreen->UsesBackground() ) - sNewBGA = THEME->GetPathB(sScreenName,"background"); + RString sNewBGA = THEME->GetPathB(sScreenName,"background"); if( !sNewBGA.empty() && sNewBGA != g_pSharedBGA->GetName() ) { @@ -633,9 +631,7 @@ Screen *ScreenManager::ActivatePreparedScreenAndBackground( const RString &sScre ASSERT_M( m_sDelayedScreen.empty(), m_sDelayedScreen ); // Find the prepared shared background (if any), and activate it. - RString sNewBGA; - if( ls.m_pScreen->UsesBackground() ) - sNewBGA = THEME->GetPathB(sScreenName,"background"); + RString sNewBGA = THEME->GetPathB(sScreenName,"background"); if( sNewBGA != g_pSharedBGA->GetName() ) { Actor *pNewBGA = NULL;