PnM Theme Update -- ScreenGameplay.
Can now have a static background overlay on screengameplay
This commit is contained in:
@@ -0,0 +1 @@
|
|||||||
|
_blank.png
|
||||||
@@ -818,6 +818,8 @@ StyleIcon=1
|
|||||||
NextScreen=ScreenGameplay
|
NextScreen=ScreenGameplay
|
||||||
|
|
||||||
[ScreenGameplay]
|
[ScreenGameplay]
|
||||||
|
StaticBGY=240
|
||||||
|
StaticBGX=320
|
||||||
PrevScreenArcade=ScreenSelectMusic
|
PrevScreenArcade=ScreenSelectMusic
|
||||||
PrevScreenNonstop=ScreenSelectCourse
|
PrevScreenNonstop=ScreenSelectCourse
|
||||||
PrevScreenOni=ScreenSelectCourse
|
PrevScreenOni=ScreenSelectCourse
|
||||||
|
|||||||
@@ -34,8 +34,8 @@ const int DS3DDX_COL_SPACING = 46;
|
|||||||
const int BM_COL_SPACING=34;
|
const int BM_COL_SPACING=34;
|
||||||
const int MANIAX_COL_SPACING = 36;
|
const int MANIAX_COL_SPACING = 36;
|
||||||
const int TECHNO_COL_SPACING = 64;
|
const int TECHNO_COL_SPACING = 64;
|
||||||
const int PNM5_COL_SPACING = 46;
|
const int PNM5_COL_SPACING = 32;
|
||||||
const int PNM9_COL_SPACING = 39;
|
const int PNM9_COL_SPACING = 32;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
char *name;
|
char *name;
|
||||||
|
|||||||
@@ -53,6 +53,8 @@
|
|||||||
#define PREV_SCREEN( play_mode ) THEME->GetMetric ("ScreenGameplay","PrevScreen"+Capitalize(PlayModeToString(play_mode)))
|
#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 NEXT_SCREEN( play_mode ) THEME->GetMetric ("ScreenGameplay","NextScreen"+Capitalize(PlayModeToString(play_mode)))
|
||||||
#define SHOW_LIFE_METER_FOR_DISABLED_PLAYERS THEME->GetMetricB("ScreenGameplay","ShowLifeMeterForDisabledPlayers")
|
#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 SECONDS_BETWEEN_COMMENTS ("ScreenGameplay","SecondsBetweenComments");
|
||||||
CachedThemeMetricF G_TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds");
|
CachedThemeMetricF G_TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds");
|
||||||
@@ -244,6 +246,10 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S
|
|||||||
m_Background.SetDiffuse( RageColor(0.4f,0.4f,0.4f,1) );
|
m_Background.SetDiffuse( RageColor(0.4f,0.4f,0.4f,1) );
|
||||||
this->AddChild( &m_Background );
|
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
|
if( !bDemonstration ) // only load if we're going to use it
|
||||||
{
|
{
|
||||||
m_Toasty.Load( THEME->GetPathToB("ScreenGameplay toasty") );
|
m_Toasty.Load( THEME->GetPathToB("ScreenGameplay toasty") );
|
||||||
|
|||||||
@@ -105,6 +105,7 @@ protected:
|
|||||||
Transition m_NextSongIn; // shows between songs in a course
|
Transition m_NextSongIn; // shows between songs in a course
|
||||||
Transition m_NextSongOut; // shows between songs in a course
|
Transition m_NextSongOut; // shows between songs in a course
|
||||||
|
|
||||||
|
Sprite m_sprStaticBackground;
|
||||||
Sprite m_sprLifeFrame;
|
Sprite m_sprLifeFrame;
|
||||||
LifeMeter* m_pLifeMeter[NUM_PLAYERS];
|
LifeMeter* m_pLifeMeter[NUM_PLAYERS];
|
||||||
CombinedLifeMeter* m_pCombinedLifeMeter;
|
CombinedLifeMeter* m_pCombinedLifeMeter;
|
||||||
|
|||||||
Reference in New Issue
Block a user