From 403e1c9f359f81651d11c51ee0e1c50bcc0bdaa3 Mon Sep 17 00:00:00 2001 From: Andrew Livy Date: Wed, 8 Oct 2003 23:32:08 +0000 Subject: [PATCH] PnM Theme Update -- ScreenGameplay. Can now have a static background overlay on screengameplay --- .../default/Graphics/ScreenGameplay Static Background.redir | 1 + stepmania/Themes/default/metrics.ini | 2 ++ stepmania/src/GameManager.cpp | 4 ++-- stepmania/src/ScreenGameplay.cpp | 6 ++++++ stepmania/src/ScreenGameplay.h | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 stepmania/Themes/default/Graphics/ScreenGameplay Static Background.redir diff --git a/stepmania/Themes/default/Graphics/ScreenGameplay Static Background.redir b/stepmania/Themes/default/Graphics/ScreenGameplay Static Background.redir new file mode 100644 index 0000000000..5c9d0d269f --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenGameplay Static Background.redir @@ -0,0 +1 @@ +_blank.png diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 086350987e..3f61411373 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -818,6 +818,8 @@ StyleIcon=1 NextScreen=ScreenGameplay [ScreenGameplay] +StaticBGY=240 +StaticBGX=320 PrevScreenArcade=ScreenSelectMusic PrevScreenNonstop=ScreenSelectCourse PrevScreenOni=ScreenSelectCourse diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index c854e0e52a..860952ae99 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -34,8 +34,8 @@ const int DS3DDX_COL_SPACING = 46; const int BM_COL_SPACING=34; const int MANIAX_COL_SPACING = 36; const int TECHNO_COL_SPACING = 64; -const int PNM5_COL_SPACING = 46; -const int PNM9_COL_SPACING = 39; +const int PNM5_COL_SPACING = 32; +const int PNM9_COL_SPACING = 32; struct { char *name; diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 89a8b0fb4d..a17f103820 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -53,6 +53,8 @@ #define PREV_SCREEN( play_mode ) THEME->GetMetric ("ScreenGameplay","PrevScreen"+Capitalize(PlayModeToString(play_mode))) #define NEXT_SCREEN( play_mode ) THEME->GetMetric ("ScreenGameplay","NextScreen"+Capitalize(PlayModeToString(play_mode))) #define SHOW_LIFE_METER_FOR_DISABLED_PLAYERS THEME->GetMetricB("ScreenGameplay","ShowLifeMeterForDisabledPlayers") +#define STATICBG_X THEME->GetMetricI ("ScreenGameplay","StaticBGX") +#define STATICBG_Y THEME->GetMetricI ("ScreenGameplay","StaticBGY") CachedThemeMetricF SECONDS_BETWEEN_COMMENTS ("ScreenGameplay","SecondsBetweenComments"); CachedThemeMetricF G_TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds"); @@ -243,6 +245,10 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S m_Background.SetDiffuse( RageColor(0.4f,0.4f,0.4f,1) ); this->AddChild( &m_Background ); + + m_sprStaticBackground.Load( THEME->GetPathToG("ScreenGameplay Static Background")); + m_sprStaticBackground.SetXY( STATICBG_X, STATICBG_Y ); + this->AddChild(&m_sprStaticBackground); if( !bDemonstration ) // only load if we're going to use it { diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index d61f0525ad..bfbce49ca0 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -105,6 +105,7 @@ protected: Transition m_NextSongIn; // shows between songs in a course Transition m_NextSongOut; // shows between songs in a course + Sprite m_sprStaticBackground; Sprite m_sprLifeFrame; LifeMeter* m_pLifeMeter[NUM_PLAYERS]; CombinedLifeMeter* m_pCombinedLifeMeter;