actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add overlay

Browse Source
This commit is contained in:
Chris Danford
2005-01-05 04:32:12 +00:00
parent 12a4fa55ac
commit 1a5d766b01
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenWithMenuElements.cpp
+10 -12
View File
@@ -32,8 +32,7 @@ ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( s
m_autoHeader.Load( THEME->GetPathToG(m_sName+" header") ); m_autoHeader.Load( THEME->GetPathToG(m_sName+" header") );
m_autoHeader->SetName("Header"); m_autoHeader->SetName("Header");
UtilSetXY( m_autoHeader, m_sName ); SET_XY_AND_ON_COMMAND( m_autoHeader );
UtilOnCommand( m_autoHeader, m_sName );
this->AddChild( m_autoHeader ); this->AddChild( m_autoHeader );
if( STYLE_ICON && GAMESTATE->m_pCurStyle ) if( STYLE_ICON && GAMESTATE->m_pCurStyle )
@@ -43,8 +42,7 @@ ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( s
m_sprStyleIcon.Load( THEME->GetPathToG(sIconFileName) ); m_sprStyleIcon.Load( THEME->GetPathToG(sIconFileName) );
m_sprStyleIcon.StopAnimating(); m_sprStyleIcon.StopAnimating();
m_sprStyleIcon.SetState( GAMESTATE->m_MasterPlayerNumber ); m_sprStyleIcon.SetState( GAMESTATE->m_MasterPlayerNumber );
UtilSetXY( m_sprStyleIcon, m_sName ); SET_XY_AND_ON_COMMAND( m_sprStyleIcon );
UtilOnCommand( m_sprStyleIcon, m_sName );
this->AddChild( &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].Load( (PlayerNumber)p );
m_MemoryCardDisplay[p].SetName( ssprintf("MemoryCardDisplayP%d",p+1) ); m_MemoryCardDisplay[p].SetName( ssprintf("MemoryCardDisplayP%d",p+1) );
UtilSetXY( m_MemoryCardDisplay[p], m_sName ); SET_XY_AND_ON_COMMAND( m_MemoryCardDisplay[p] );
UtilOnCommand( m_MemoryCardDisplay[p], m_sName );
this->AddChild( &m_MemoryCardDisplay[p] ); this->AddChild( &m_MemoryCardDisplay[p] );
} }
} }
@@ -66,27 +63,28 @@ ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( s
m_MenuTimer->SetName( "Timer" ); m_MenuTimer->SetName( "Timer" );
if( TIMER_STEALTH ) if( TIMER_STEALTH )
m_MenuTimer->EnableStealth( true ); m_MenuTimer->EnableStealth( true );
UtilSetXY( m_MenuTimer, m_sName ); SET_XY_AND_ON_COMMAND( m_MenuTimer );
UtilOnCommand( m_MenuTimer, m_sName );
ResetTimer(); ResetTimer();
this->AddChild( m_MenuTimer ); this->AddChild( m_MenuTimer );
} }
m_autoFooter.Load( THEME->GetPathToG(m_sName+" footer") ); m_autoFooter.Load( THEME->GetPathToG(m_sName+" footer") );
m_autoFooter->SetName("Footer"); m_autoFooter->SetName("Footer");
UtilSetXY( m_autoFooter, m_sName ); SET_XY_AND_ON_COMMAND( m_autoFooter );
UtilOnCommand( m_autoFooter, m_sName );
this->AddChild( m_autoFooter ); this->AddChild( m_autoFooter );
m_textHelp->SetName( "HelpDisplay", "Help" ); m_textHelp->SetName( "HelpDisplay", "Help" );
m_textHelp->Load(); m_textHelp->Load();
UtilSetXY( m_textHelp, m_sName ); SET_XY_AND_ON_COMMAND( m_textHelp );
UtilOnCommand( m_textHelp, m_sName );
CStringArray asHelpTips; CStringArray asHelpTips;
split( THEME->GetMetric(m_sName,"HelpText"), "\n", asHelpTips ); split( THEME->GetMetric(m_sName,"HelpText"), "\n", asHelpTips );
m_textHelp->SetTips( asHelpTips ); m_textHelp->SetTips( asHelpTips );
this->AddChild( m_textHelp ); 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.Load( THEME->GetPathToB(m_sName+" in") );
m_In.SetDrawOrder( DRAW_ORDER_TRANSITIONS ); m_In.SetDrawOrder( DRAW_ORDER_TRANSITIONS );
stepmania/src/ScreenWithMenuElements.h
+1
View File
@@ -33,6 +33,7 @@ protected:
MenuTimer *m_MenuTimer; MenuTimer *m_MenuTimer;
AutoActor m_autoFooter; AutoActor m_autoFooter;
HelpDisplay *m_textHelp; HelpDisplay *m_textHelp;
AutoActor m_sprOverlay;
Transition m_In; Transition m_In;
Transition m_Out; Transition m_Out;