diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp index 3f779e02b0..956ace6c79 100644 --- a/stepmania/src/ActorUtil.cpp +++ b/stepmania/src/ActorUtil.cpp @@ -322,6 +322,14 @@ void AutoActor::LoadAndSetName( const CString &sScreenName, const CString &sActo m_pActor->SetName( sActorName ); } +void UtilSetQuadInit( Actor& actor, const CString &sClassName ) +{ + UtilSetXYAndOnCommand( actor, sClassName ); + actor.SetDiffuse( THEME->GetMetricC( sClassName, actor.m_sName + "Color" ) ); + actor.SetWidth( THEME->GetMetricF( sClassName, actor.m_sName + "Width" ) ); + actor.SetHeight( THEME->GetMetricF( sClassName, actor.m_sName + "Height" ) ); +} + /* * (c) 2003-2004 Chris Danford * All rights reserved. diff --git a/stepmania/src/ActorUtil.h b/stepmania/src/ActorUtil.h index bd73fadd22..84964eb81b 100644 --- a/stepmania/src/ActorUtil.h +++ b/stepmania/src/ActorUtil.h @@ -10,6 +10,7 @@ #define OFF_COMMAND( actor ) UtilOffCommand( actor, m_sName ) #define SET_XY_AND_ON_COMMAND( actor ) UtilSetXYAndOnCommand( actor, m_sName ) #define COMMAND( actor, command_name ) UtilCommand( actor, m_sName, command_name ) +#define SET_QUAD_INIT( actor ) UtilSetQuadInit( actor, m_sName ); void UtilSetXY( Actor& actor, const CString &sClassName ); @@ -25,6 +26,7 @@ inline void UtilSetXYAndOnCommand( Actor& actor, const CString &sClassName ) UtilSetXY( actor, sClassName ); UtilOnCommand( actor, sClassName ); } +void UtilSetQuadInit( Actor& actor, const CString &sClassName ); /* convenience */ inline void UtilCommand( Actor* pActor, const CString &sClassName, const CString &sCommandName ) { if(pActor) UtilCommand( *pActor, sClassName, sCommandName ); } diff --git a/stepmania/src/ScreenNetRoom.cpp b/stepmania/src/ScreenNetRoom.cpp index a713cde8c6..b69cdeab27 100644 --- a/stepmania/src/ScreenNetRoom.cpp +++ b/stepmania/src/ScreenNetRoom.cpp @@ -8,20 +8,10 @@ #include "ThemeManager.h" #define TITLEBG_WIDTH THEME->GetMetricF(m_sName,"TitleBGWidth") -#define TITLEBG_HEIGHT THEME->GetMetricF(m_sName,"TitleBGHeight") -#define TITLEBG_COLOR THEME->GetMetricC(m_sName,"TitleBGColor") - #define ROOMSBG_WIDTH THEME->GetMetricF(m_sName,"RoomsBGWidth") -#define ROOMSBG_HEIGHT THEME->GetMetricF(m_sName,"RoomsBGHeight") -#define ROOMSBG_COLOR THEME->GetMetricC(m_sName,"RoomsBGColor") #define NUM_ROOMS_SHOW THEME->GetMetricI(m_sName,"NumRoomsShow"); -#define SEL_WIDTH THEME->GetMetricF(m_sName,"SelWidth") -#define SEL_HEIGHT THEME->GetMetricF(m_sName,"SelHeight") -#define SEL_COLOR THEME->GetMetricC(m_sName,"SelColor") - - const ScreenMessage SM_SMOnlinePack = ScreenMessage(SM_User+8); //Unused, but should be known @@ -32,11 +22,8 @@ ScreenNetRoom::ScreenNetRoom( const CString& sName ) : ScreenNetSelectBase( sNam m_iRoomPlace = 0; - m_rectTitleBG.SetDiffuse( TITLEBG_COLOR ); m_rectTitleBG.SetName( "TitleBG" ); - m_rectTitleBG.SetWidth( TITLEBG_WIDTH ); - m_rectTitleBG.SetHeight( TITLEBG_HEIGHT ); - SET_XY_AND_ON_COMMAND( m_rectTitleBG ); + SET_QUAD_INIT( m_rectTitleBG ); this->AddChild( &m_rectTitleBG); m_textTitle.LoadFromFont( THEME->GetPathF(m_sName,"wheel") ); @@ -46,11 +33,8 @@ ScreenNetRoom::ScreenNetRoom( const CString& sName ) : ScreenNetSelectBase( sNam SET_XY_AND_ON_COMMAND( m_textTitle ); this->AddChild( &m_textTitle); - m_rectRoomsBG.SetDiffuse( ROOMSBG_COLOR ); m_rectRoomsBG.SetName( "RoomsBG" ); - m_rectRoomsBG.SetWidth( ROOMSBG_WIDTH ); - m_rectRoomsBG.SetHeight( ROOMSBG_HEIGHT ); - SET_XY_AND_ON_COMMAND( m_rectRoomsBG ); + SET_QUAD_INIT( m_rectRoomsBG ); this->AddChild( &m_rectRoomsBG); m_textRooms.LoadFromFont( THEME->GetPathF(m_sName,"wheel") ); @@ -60,11 +44,8 @@ ScreenNetRoom::ScreenNetRoom( const CString& sName ) : ScreenNetSelectBase( sNam SET_XY_AND_ON_COMMAND( m_textRooms ); this->AddChild( &m_textRooms ); - m_rectRoomsSel.SetDiffuse( SEL_COLOR ); m_rectRoomsSel.SetName( "Sel" ); - m_rectRoomsSel.SetWidth( SEL_WIDTH ); - m_rectRoomsSel.SetHeight( SEL_HEIGHT ); - SET_XY_AND_ON_COMMAND( m_rectRoomsSel ); + SET_QUAD_INIT( m_rectRoomsSel ); this->AddChild( &m_rectRoomsSel ); NSMAN->ReportNSSOnOff(7); diff --git a/stepmania/src/ScreenNetSelectBase.cpp b/stepmania/src/ScreenNetSelectBase.cpp index 7ab065d411..f21f146d55 100644 --- a/stepmania/src/ScreenNetSelectBase.cpp +++ b/stepmania/src/ScreenNetSelectBase.cpp @@ -20,9 +20,6 @@ #define CHATOUTPUT_COLOR THEME->GetMetricC(m_sName,"ChatOutputBoxColor") #define SHOW_CHAT_LINES THEME->GetMetricI(m_sName,"ChatOutputLines") -#define USERSBG_WIDTH THEME->GetMetricF(m_sName,"UsersBGWidth") -#define USERSBG_HEIGHT THEME->GetMetricF(m_sName,"UsersBGHeight") -#define USERSBG_COLOR THEME->GetMetricC(m_sName,"UsersBGColor") #define USERSALT_Y THEME->GetMetricF(m_sName,"UsersAY") #define USERSDELT_X THEME->GetMetricF(m_sName,"UsersDX") #define USERS_Y THEME->GetMetricF(m_sName,"UsersY") @@ -80,11 +77,8 @@ ScreenNetSelectBase::ScreenNetSelectBase( const CString& sName ) : ScreenWithMen //Users' Background - m_rectUsersBG.SetDiffuse( USERSBG_COLOR ); m_rectUsersBG.SetName( "UsersBG" ); - m_rectUsersBG.SetWidth( USERSBG_WIDTH ); - m_rectUsersBG.SetHeight( USERSBG_HEIGHT ); - SET_XY_AND_ON_COMMAND( m_rectUsersBG ); + SET_QUAD_INIT( m_rectUsersBG ); this->AddChild( &m_rectUsersBG ); //Display users list diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp index 437ce275d8..1d4e6e1ee0 100644 --- a/stepmania/src/ScreenNetSelectMusic.cpp +++ b/stepmania/src/ScreenNetSelectMusic.cpp @@ -18,33 +18,16 @@ #include "StepsUtil.h" #include "RageUtil.h" -#define GROUPSBG_WIDTH THEME->GetMetricF(m_sName,"GroupsBGWidth") -#define GROUPSBG_HEIGHT THEME->GetMetricF(m_sName,"GroupsBGHeight") -#define GROUPSBG_COLOR THEME->GetMetricC(m_sName,"GroupsBGColor") - -#define SONGSBG_WIDTH THEME->GetMetricF(m_sName,"SongsBGWidth") -#define SONGSBG_HEIGHT THEME->GetMetricF(m_sName,"SongsBGHeight") -#define SONGSBG_COLOR THEME->GetMetricC(m_sName,"SongsBGColor") - -#define DIFFBG_WIDTH THEME->GetMetricF(m_sName,"DiffBGWidth") -#define DIFFBG_HEIGHT THEME->GetMetricF(m_sName,"DiffBGHeight") -#define DIFFBG_COLOR THEME->GetMetricC(m_sName,"DiffBGColor") - -#define EXINFOBG_WIDTH THEME->GetMetricF(m_sName,"ExInfoBGWidth") -#define EXINFOBG_HEIGHT THEME->GetMetricF(m_sName,"ExInfoBGHeight") -#define EXINFOBG_COLOR THEME->GetMetricC(m_sName,"ExInfoBGColor") - #define NUM_GROUPS_SHOW THEME->GetMetricI(m_sName,"NumGroupsShow"); #define NUM_SONGS_SHOW THEME->GetMetricI(m_sName,"NumSongsShow"); -#define SEL_WIDTH THEME->GetMetricF(m_sName,"SelWidth") -#define SEL_HEIGHT THEME->GetMetricF(m_sName,"SelHeight") -#define SEL_COLOR THEME->GetMetricC(m_sName,"SelColor") - #define SUBTITLE_WIDTH THEME->GetMetricF(m_sName,"SongsSubtitleWidth") #define ARTIST_WIDTH THEME->GetMetricF(m_sName,"SongsArtistWidth") #define GROUP_WIDTH THEME->GetMetricF(m_sName,"SongsGroupWidth") +#define GROUPSBG_WIDTH THEME->GetMetricF(m_sName,"GroupsBGWidth") +#define SONGSBG_WIDTH THEME->GetMetricF(m_sName,"SongsBGWidth") + const ScreenMessage SM_NoSongs = ScreenMessage(SM_User+3); const ScreenMessage SM_ChangeSong = ScreenMessage(SM_User+5); const ScreenMessage SM_BackFromOpts = ScreenMessage(SM_User+6); @@ -58,11 +41,8 @@ ScreenNetSelectMusic::ScreenNetSelectMusic( const CString& sName ) : ScreenNetSe GAMESTATE->FinishStage(); //Groups - m_rectGroupsBackground.SetDiffuse( GROUPSBG_COLOR ); m_rectGroupsBackground.SetName( "GroupsBG" ); - m_rectGroupsBackground.SetWidth( GROUPSBG_WIDTH ); - m_rectGroupsBackground.SetHeight( GROUPSBG_HEIGHT ); - SET_XY_AND_ON_COMMAND( m_rectGroupsBackground ); + SET_QUAD_INIT( m_rectGroupsBackground ); this->AddChild( &m_rectGroupsBackground ); m_textGroups.LoadFromFont( THEME->GetPathF(m_sName,"wheel") ); @@ -73,11 +53,8 @@ ScreenNetSelectMusic::ScreenNetSelectMusic( const CString& sName ) : ScreenNetSe this->AddChild( &m_textGroups); //Songs - m_rectSongsBackground.SetDiffuse( SONGSBG_COLOR ); - m_rectSongsBackground.SetName( "SongsBackground" ); - m_rectSongsBackground.SetWidth( SONGSBG_WIDTH ); - m_rectSongsBackground.SetHeight( SONGSBG_HEIGHT ); - SET_XY_AND_ON_COMMAND( m_rectSongsBackground ); + m_rectSongsBackground.SetName( "SongsBG" ); + SET_QUAD_INIT( m_rectSongsBackground ); this->AddChild( &m_rectSongsBackground ); m_textSongs.LoadFromFont( THEME->GetPathF(m_sName,"wheel") ); @@ -87,11 +64,8 @@ ScreenNetSelectMusic::ScreenNetSelectMusic( const CString& sName ) : ScreenNetSe SET_XY_AND_ON_COMMAND( m_textSongs ); this->AddChild( &m_textSongs); - m_rectExInfo.SetDiffuse( EXINFOBG_COLOR ); m_rectExInfo.SetName( "ExInfoBG" ); - m_rectExInfo.SetWidth( EXINFOBG_WIDTH ); - m_rectExInfo.SetHeight( EXINFOBG_HEIGHT ); - SET_XY_AND_ON_COMMAND( m_rectExInfo ); + SET_QUAD_INIT( m_rectExInfo ); this->AddChild( &m_rectExInfo ); m_textArtist.LoadFromFont( THEME->GetPathF(m_sName,"song") ); @@ -122,11 +96,8 @@ ScreenNetSelectMusic::ScreenNetSelectMusic( const CString& sName ) : ScreenNetSe this->AddChild( &m_sprSelOptions ); //Diff Icon background - m_rectDiff.SetDiffuse( DIFFBG_COLOR ); m_rectDiff.SetName( "DiffBG" ); - m_rectDiff.SetWidth( DIFFBG_WIDTH ); - m_rectDiff.SetHeight( DIFFBG_HEIGHT ); - SET_XY_AND_ON_COMMAND( m_rectDiff ); + SET_QUAD_INIT( m_rectDiff ); this->AddChild( &m_rectDiff ); FOREACH_EnabledPlayer (p) @@ -148,11 +119,8 @@ ScreenNetSelectMusic::ScreenNetSelectMusic( const CString& sName ) : ScreenNetSe } m_SelectMode = SelectGroup; - m_rectSelection.SetDiffuse( SEL_COLOR ); m_rectSelection.SetName( "Sel" ); - m_rectSelection.SetWidth( SEL_WIDTH ); - m_rectSelection.SetHeight( SEL_HEIGHT ); - SET_XY_AND_ON_COMMAND( m_rectSelection ); + SET_QUAD_INIT( m_rectSelection ); this->AddChild( &m_rectSelection );