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

simplify and fix ScreenSelectMaster::MenuStart

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-10 18:57:29 +00:00
parent 9484896b79
commit 7589a61591
2 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMaster.cpp
+29 -37
View File
@@ -414,52 +414,44 @@ ScreenSelectMaster::Page ScreenSelectMaster::GetCurrentPage()
} }
float ScreenSelectMaster::DoMenuStart( PlayerNumber pn )
{
if( m_bChosen[pn] == true )
return 0;
m_bChosen[pn] = true;
float fSecs = 0;
for( int page=0; page<NUM_PAGES; page++ )
fSecs = max( fSecs, OFF_COMMAND( m_sprMore[page] ) );
for( int i=0; i<NUM_CURSOR_PARTS; i++ )
fSecs = max( fSecs, COMMAND( m_sprCursor[i][pn], "Choose") );
return fSecs;
}
void ScreenSelectMaster::MenuStart( PlayerNumber pn ) void ScreenSelectMaster::MenuStart( PlayerNumber pn )
{ {
if( m_fLockInputSecs > 0 ) if( m_fLockInputSecs > 0 )
return; return;
if( m_bChosen[pn] == true )
return;
m_bChosen[pn] = true;
for( int page=0; page<NUM_PAGES; page++ ) SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("%s comment %s",m_sName.c_str(), m_aModeChoices[m_iChoice[pn]].m_sName.c_str())) );
OFF_COMMAND( m_sprMore[page] ); m_soundSelect.Play();
const ModeChoice& mc = m_aModeChoices[m_iChoice[pn]];
/* Don't play sound if we're on the second page and another player
* has already selected, since it just played. */
bool AnotherPlayerSelected = false;
int p;
for( p=0; p<NUM_PLAYERS; p++ )
if(p != pn && m_bChosen[p])
AnotherPlayerSelected = true;
if(GetCurrentPage() != PAGE_2 || !AnotherPlayerSelected)
{
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("%s comment %s",m_sName.c_str(), mc.m_sName.c_str())) );
m_soundSelect.Play();
}
if( GetCurrentPage() == PAGE_2 )
{
// choose this for all the other players too
for( p=0; p<NUM_PLAYERS; p++ )
if( GAMESTATE->IsHumanPlayer(p) && !m_bChosen[p] )
MenuStart( (PlayerNumber)p );
}
float fSecs = 0;
for( int i=0; i<NUM_CURSOR_PARTS; i++ )
fSecs = max( fSecs, COMMAND( m_sprCursor[i][pn], "Choose") );
bool bAllDone = true; bool bAllDone = true;
float fSecs = 0;
/* If SHARED_PREVIEW_AND_CURSOR, only one player has to pick. */ if( SHARED_PREVIEW_AND_CURSOR || GetCurrentPage() == PAGE_2 )
if( !SHARED_PREVIEW_AND_CURSOR )
{ {
/* Only one player has to pick. Choose this for all the other players, too. */
for( int p=0; p<NUM_PLAYERS; p++ )
if( GAMESTATE->IsHumanPlayer(p) )
{
ASSERT( !m_bChosen[p] );
fSecs = max( fSecs, DoMenuStart( (PlayerNumber)p ) );
}
} else {
fSecs = max( fSecs, DoMenuStart(pn) );
// check to see if everyone has chosen // check to see if everyone has chosen
for( p=0; p<NUM_PLAYERS; p++ ) for( int p=0; p<NUM_PLAYERS; p++ )
if( GAMESTATE->IsHumanPlayer((PlayerNumber)p) ) if( GAMESTATE->IsHumanPlayer((PlayerNumber)p) )
bAllDone &= m_bChosen[p]; bAllDone &= m_bChosen[p];
} }
stepmania/src/ScreenSelectMaster.h
+1
View File
@@ -48,6 +48,7 @@ protected:
bool Move( PlayerNumber pn, int dir ); bool Move( PlayerNumber pn, int dir );
bool ChangePage( int iNewChoice ); bool ChangePage( int iNewChoice );
bool ChangeSelection( PlayerNumber pn, int iNewChoice ); bool ChangeSelection( PlayerNumber pn, int iNewChoice );
float DoMenuStart( PlayerNumber pn );
float GetCursorX( PlayerNumber pn, int iPartIndex ); float GetCursorX( PlayerNumber pn, int iPartIndex );
float GetCursorY( PlayerNumber pn, int iPartIndex ); float GetCursorY( PlayerNumber pn, int iPartIndex );