From 1a5d766b010108922012b9ab01a9b27e0dbdcb2e Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 5 Jan 2005 04:32:12 +0000 Subject: [PATCH] add overlay --- stepmania/src/ScreenWithMenuElements.cpp | 22 ++++++++++------------ stepmania/src/ScreenWithMenuElements.h | 1 + 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp index 80582922b5..2877dd3638 100644 --- a/stepmania/src/ScreenWithMenuElements.cpp +++ b/stepmania/src/ScreenWithMenuElements.cpp @@ -32,8 +32,7 @@ ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( s m_autoHeader.Load( THEME->GetPathToG(m_sName+" header") ); m_autoHeader->SetName("Header"); - UtilSetXY( m_autoHeader, m_sName ); - UtilOnCommand( m_autoHeader, m_sName ); + SET_XY_AND_ON_COMMAND( m_autoHeader ); this->AddChild( m_autoHeader ); if( STYLE_ICON && GAMESTATE->m_pCurStyle ) @@ -43,8 +42,7 @@ ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( s m_sprStyleIcon.Load( THEME->GetPathToG(sIconFileName) ); m_sprStyleIcon.StopAnimating(); m_sprStyleIcon.SetState( GAMESTATE->m_MasterPlayerNumber ); - UtilSetXY( m_sprStyleIcon, m_sName ); - UtilOnCommand( m_sprStyleIcon, m_sName ); + SET_XY_AND_ON_COMMAND( m_sprStyleIcon ); this->AddChild( &m_sprStyleIcon ); } @@ -54,8 +52,7 @@ ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( s { m_MemoryCardDisplay[p].Load( (PlayerNumber)p ); m_MemoryCardDisplay[p].SetName( ssprintf("MemoryCardDisplayP%d",p+1) ); - UtilSetXY( m_MemoryCardDisplay[p], m_sName ); - UtilOnCommand( m_MemoryCardDisplay[p], m_sName ); + SET_XY_AND_ON_COMMAND( m_MemoryCardDisplay[p] ); this->AddChild( &m_MemoryCardDisplay[p] ); } } @@ -66,27 +63,28 @@ ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( s m_MenuTimer->SetName( "Timer" ); if( TIMER_STEALTH ) m_MenuTimer->EnableStealth( true ); - UtilSetXY( m_MenuTimer, m_sName ); - UtilOnCommand( m_MenuTimer, m_sName ); + SET_XY_AND_ON_COMMAND( m_MenuTimer ); ResetTimer(); this->AddChild( m_MenuTimer ); } m_autoFooter.Load( THEME->GetPathToG(m_sName+" footer") ); m_autoFooter->SetName("Footer"); - UtilSetXY( m_autoFooter, m_sName ); - UtilOnCommand( m_autoFooter, m_sName ); + SET_XY_AND_ON_COMMAND( m_autoFooter ); this->AddChild( m_autoFooter ); m_textHelp->SetName( "HelpDisplay", "Help" ); m_textHelp->Load(); - UtilSetXY( m_textHelp, m_sName ); - UtilOnCommand( m_textHelp, m_sName ); + SET_XY_AND_ON_COMMAND( m_textHelp ); CStringArray asHelpTips; split( THEME->GetMetric(m_sName,"HelpText"), "\n", asHelpTips ); m_textHelp->SetTips( asHelpTips ); this->AddChild( m_textHelp ); + m_sprOverlay.Load( THEME->GetPathToB(m_sName+" overlay") ); + m_sprOverlay->SetName("Overlay"); + SET_XY_AND_ON_COMMAND( m_sprOverlay ); + this->AddChild( m_sprOverlay ); m_In.Load( THEME->GetPathToB(m_sName+" in") ); m_In.SetDrawOrder( DRAW_ORDER_TRANSITIONS ); diff --git a/stepmania/src/ScreenWithMenuElements.h b/stepmania/src/ScreenWithMenuElements.h index fae887ebd4..d98e6456fa 100644 --- a/stepmania/src/ScreenWithMenuElements.h +++ b/stepmania/src/ScreenWithMenuElements.h @@ -33,6 +33,7 @@ protected: MenuTimer *m_MenuTimer; AutoActor m_autoFooter; HelpDisplay *m_textHelp; + AutoActor m_sprOverlay; Transition m_In; Transition m_Out;