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

COMMAND->PlayCommand

Browse Source
This commit is contained in:
Glenn Maynard
2007-05-04 04:42:49 +00:00
parent 499699d226
commit 5870ec4d09
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMaster.cpp
+11 -11
View File
@@ -306,7 +306,7 @@ void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM )
FOREACH( PlayerNumber, vpns, p ) FOREACH( PlayerNumber, vpns, p )
{ {
m_sprCursor[*p]->SetXY( GetCursorX(*p), GetCursorY(*p) ); m_sprCursor[*p]->SetXY( GetCursorX(*p), GetCursorY(*p) );
COMMAND( m_sprCursor[*p], "PostSwitchPage" ); m_sprCursor[*p]->PlayCommand( "PostSwitchPage" );
} }
} }
@@ -315,7 +315,7 @@ void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM )
FOREACH( PlayerNumber, vpns, p ) FOREACH( PlayerNumber, vpns, p )
{ {
int iChoice = m_iChoice[*p]; int iChoice = m_iChoice[*p];
COMMAND( m_vsprScroll[*p][iChoice], "PostSwitchPage" ); m_vsprScroll[*p][iChoice]->PlayCommand( "PostSwitchPage" );
} }
} }
@@ -516,7 +516,7 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice )
{ {
FOREACH( PlayerNumber, vpns, p ) FOREACH( PlayerNumber, vpns, p )
if( GAMESTATE->IsHumanPlayer(*p) ) if( GAMESTATE->IsHumanPlayer(*p) )
COMMAND( m_sprCursor[*p], "PreSwitchPage" ); m_sprCursor[*p]->PlayCommand( "PreSwitchPage" );
} }
const RString sIconAndExplanationCommand = ssprintf( "SwitchToPage%d", newPage+1 ); const RString sIconAndExplanationCommand = ssprintf( "SwitchToPage%d", newPage+1 );
@@ -524,7 +524,7 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice )
if( SHOW_ICON ) if( SHOW_ICON )
{ {
for( unsigned c=0; c<m_aGameCommands.size(); c++ ) for( unsigned c=0; c<m_aGameCommands.size(); c++ )
COMMAND( m_vsprIcon[c], sIconAndExplanationCommand ); m_vsprIcon[c]->PlayCommand( sIconAndExplanationCommand );
} }
if( SHOW_SCROLLER ) if( SHOW_SCROLLER )
@@ -532,22 +532,22 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice )
if( SHARED_SELECTION ) if( SHARED_SELECTION )
{ {
int iChoice = m_iChoice[GetSharedPlayer()]; int iChoice = m_iChoice[GetSharedPlayer()];
COMMAND( m_vsprScroll[0][iChoice], "PreSwitchPage" ); m_vsprScroll[0][iChoice]->PlayCommand( "PreSwitchPage" );
} }
else else
{ {
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
{ {
int iChoice = m_iChoice[p]; int iChoice = m_iChoice[p];
COMMAND( m_vsprScroll[p][iChoice], "PreSwitchPage" ); m_vsprScroll[p][iChoice]->PlayCommand( "PreSwitchPage" );
} }
} }
} }
for( int page=0; page<NUM_PAGES; page++ ) for( int page=0; page<NUM_PAGES; page++ )
{ {
COMMAND( m_sprExplanation[page], sIconAndExplanationCommand ); m_sprExplanation[page]->PlayCommand( sIconAndExplanationCommand );
COMMAND( m_sprMore[page], sIconAndExplanationCommand ); m_sprMore[page]->PlayCommand( sIconAndExplanationCommand );
} }
@@ -602,12 +602,12 @@ bool ScreenSelectMaster::ChangeSelection( PlayerNumber pn, MenuDir dir, int iNew
{ {
if( SHARED_SELECTION ) if( SHARED_SELECTION )
{ {
COMMAND( m_sprCursor[0], "Change" ); m_sprCursor[0]->PlayCommand( "Change" );
m_sprCursor[0]->SetXY( GetCursorX(PLAYER_1), GetCursorY(PLAYER_1) ); m_sprCursor[0]->SetXY( GetCursorX(PLAYER_1), GetCursorY(PLAYER_1) );
} }
else else
{ {
COMMAND( m_sprCursor[p], "Change" ); m_sprCursor[p]->PlayCommand( "Change" );
m_sprCursor[p]->SetXY( GetCursorX(p), GetCursorY(p) ); m_sprCursor[p]->SetXY( GetCursorX(p), GetCursorY(p) );
} }
} }
@@ -702,7 +702,7 @@ float ScreenSelectMaster::DoMenuStart( PlayerNumber pn )
if( SHOW_CURSOR ) if( SHOW_CURSOR )
{ {
COMMAND( m_sprCursor[pn], "Choose"); m_sprCursor[pn]->PlayCommand( "Choose" );
fSecs = max( fSecs, m_sprCursor[iIndex]->GetTweenTimeLeft() ); fSecs = max( fSecs, m_sprCursor[iIndex]->GetTweenTimeLeft() );
} }
} }