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

add OldPageIndex and NewPageIndex to *SwitchPage messages

Browse Source
This commit is contained in:
Chris Danford
2007-11-21 09:38:13 +00:00
parent dfc1a43afd
commit cbe1bed2d9
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMaster.cpp
+15 -4
View File
@@ -299,10 +299,16 @@ void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM )
if( SM == SM_PlayPostSwitchPage ) if( SM == SM_PlayPostSwitchPage )
{ {
int iNewChoice = m_iChoice[ GAMESTATE->m_MasterPlayerNumber ];
Page newPage = GetPage( iNewChoice );
Message msg("PostSwitchPage");
msg.SetParam( "NewPageIndex", (int)newPage );
if( SHOW_CURSOR ) if( SHOW_CURSOR )
{ {
FOREACH( PlayerNumber, vpns, p ) FOREACH( PlayerNumber, vpns, p )
m_sprCursor[*p]->PlayCommand( "PostSwitchPage" ); m_sprCursor[*p]->HandleMessage( msg );
} }
if( SHOW_SCROLLER ) if( SHOW_SCROLLER )
@@ -310,7 +316,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];
m_vsprScroll[*p][iChoice]->PlayCommand( "PostSwitchPage" ); m_vsprScroll[*p][iChoice]->HandleMessage( msg );
} }
} }
@@ -485,6 +491,7 @@ void ScreenSelectMaster::MenuDown( const InputEventPlus &input )
bool ScreenSelectMaster::ChangePage( int iNewChoice ) bool ScreenSelectMaster::ChangePage( int iNewChoice )
{ {
Page oldPage = GetPage( m_iChoice[GAMESTATE->m_MasterPlayerNumber] );
Page newPage = GetPage( iNewChoice ); Page newPage = GetPage( iNewChoice );
// If anyone has already chosen, don't allow changing of pages // If anyone has already chosen, don't allow changing of pages
@@ -520,16 +527,20 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice )
vpns.push_back( p ); vpns.push_back( p );
} }
Message msg("PreSwitchPage");
msg.SetParam( "OldPageIndex", (int)oldPage );
msg.SetParam( "NewPageIndex", (int)newPage );
FOREACH( PlayerNumber, vpns, p ) FOREACH( PlayerNumber, vpns, p )
{ {
if( SHOW_CURSOR ) if( SHOW_CURSOR )
{ {
m_sprCursor[*p]->PlayCommand( "PreSwitchPage" ); m_sprCursor[*p]->HandleMessage( msg );
m_sprCursor[*p]->SetXY( GetCursorX(*p), GetCursorY(*p) ); m_sprCursor[*p]->SetXY( GetCursorX(*p), GetCursorY(*p) );
} }
if( SHOW_SCROLLER ) if( SHOW_SCROLLER )
m_vsprScroll[*p][m_iChoice[*p]]->PlayCommand( "PreSwitchPage" ); m_vsprScroll[*p][m_iChoice[*p]]->HandleMessage( msg );
} }
if( newPage == PAGE_2 ) if( newPage == PAGE_2 )