diff --git a/stepmania/src/ScreenNetRoom.cpp b/stepmania/src/ScreenNetRoom.cpp index 47ed4c3e66..50d23e061a 100644 --- a/stepmania/src/ScreenNetRoom.cpp +++ b/stepmania/src/ScreenNetRoom.cpp @@ -11,6 +11,7 @@ #include "VirtualKeyboard.h" #define TITLEBG_WIDTH THEME->GetMetricF(m_sName,"TitleBGWidth") +#define TITLEBG_HEIGHT THEME->GetMetricF(m_sName,"TitleBGHeight") #define ROOMSBG_WIDTH THEME->GetMetricF(m_sName,"RoomsBGWidth") #define ROOMSBG_HEIGHT THEME->GetMetricF(m_sName,"RoomsBGHeight") #define SELECTION_WIDTH THEME->GetMetricF(m_sName,"SelectionWidth") @@ -31,9 +32,12 @@ ScreenNetRoom::ScreenNetRoom( const CString& sName ) : ScreenNetSelectBase( sNam m_iRoomPlace = 0; m_SelectMode = SelectRooms; - m_rectTitleBG.SetName( "TitleBG" ); - SET_QUAD_INIT( m_rectTitleBG ); - this->AddChild( &m_rectTitleBG); + m_sprTitleBG.Load( THEME->GetPathG( m_sName, "TitleBG" ) ); + m_sprTitleBG.SetName( "TitleBG" ); + m_sprTitleBG.SetWidth( TITLEBG_WIDTH ); + m_sprTitleBG.SetHeight( TITLEBG_HEIGHT ); + SET_XY_AND_ON_COMMAND( m_sprTitleBG ); + this->AddChild( &m_sprTitleBG); m_textTitle.LoadFromFont( THEME->GetPathF(m_sName,"wheel") ); m_textTitle.SetShadowLength( 0 ); @@ -145,7 +149,7 @@ void ScreenNetRoom::HandleScreenMessage( const ScreenMessage SM ) void ScreenNetRoom::TweenOffScreen() { OFF_COMMAND( m_textTitle ); - OFF_COMMAND( m_rectTitleBG ); + OFF_COMMAND( m_sprTitleBG ); OFF_COMMAND( m_sprRoomsBG ); OFF_COMMAND( m_textRooms ); OFF_COMMAND( m_sprSelection ); diff --git a/stepmania/src/ScreenNetRoom.h b/stepmania/src/ScreenNetRoom.h index 46e8beafb5..cebc65cc93 100644 --- a/stepmania/src/ScreenNetRoom.h +++ b/stepmania/src/ScreenNetRoom.h @@ -43,7 +43,7 @@ private: RageSound m_soundChangeSel; BitmapText m_textTitle; - Quad m_rectTitleBG; + Sprite m_sprTitleBG; Sprite m_sprRoomsBG; BitmapText m_textRooms; diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp index c4a6ce3477..9bad49396d 100644 --- a/stepmania/src/ScreenNetSelectMusic.cpp +++ b/stepmania/src/ScreenNetSelectMusic.cpp @@ -30,6 +30,9 @@ const ScreenMessage SM_RefreshWheelLocation = ScreenMessage(SM_User+20); const CString AllGroups = "[ALL MUSIC]"; +#define DIFFBG_WIDTH THEME->GetMetricF(m_sName,"DiffBGWidth") +#define DIFFBG_HEIGHT THEME->GetMetricF(m_sName,"DiffBGHeight") + REGISTER_SCREEN_CLASS( ScreenNetSelectMusic ); ScreenNetSelectMusic::ScreenNetSelectMusic( const CString& sName ) : ScreenNetSelectBase( sName ) { @@ -37,9 +40,12 @@ ScreenNetSelectMusic::ScreenNetSelectMusic( const CString& sName ) : ScreenNetSe GAMESTATE->FinishStage(); //Diff Icon background - m_rectDiff.SetName( "DiffBG" ); - SET_QUAD_INIT( m_rectDiff ); - this->AddChild( &m_rectDiff ); + m_sprDiff.Load( THEME->GetPathG( m_sName, "DiffBG" ) ); + m_sprDiff.SetName( "DiffBG" ); + m_sprDiff.SetWidth( DIFFBG_WIDTH ); + m_sprDiff.SetHeight( DIFFBG_HEIGHT ); + SET_XY_AND_ON_COMMAND( m_sprDiff ); + this->AddChild( &m_sprDiff); FOREACH_EnabledPlayer (p) { @@ -389,7 +395,7 @@ void ScreenNetSelectMusic::TweenOffScreen() OFF_COMMAND( m_BPMDisplay ); - OFF_COMMAND( m_rectDiff ); + OFF_COMMAND( m_sprDiff ); FOREACH_EnabledPlayer (pn) { diff --git a/stepmania/src/ScreenNetSelectMusic.h b/stepmania/src/ScreenNetSelectMusic.h index f134217115..49fdd8f171 100644 --- a/stepmania/src/ScreenNetSelectMusic.h +++ b/stepmania/src/ScreenNetSelectMusic.h @@ -68,7 +68,7 @@ protected: private: MusicWheel m_MusicWheel; - Quad m_rectDiff; + Sprite m_sprDiff; //Difficulty Icon(s) DifficultyIcon m_DifficultyIcon[NUM_PLAYERS];