This commit is contained in:
Chris Danford
2004-07-28 16:05:39 +00:00
parent 9da7a69cb1
commit ffc40c312c
2 changed files with 8 additions and 10 deletions
+1 -1
View File
@@ -176,7 +176,7 @@ void ScreenSelect::FinalizeChoices()
FOREACH_PlayerNumber( p )
if( GAMESTATE->IsHumanPlayer(p) )
{
const int sel = GetSelectionIndex( (PlayerNumber)p );
const int sel = GetSelectionIndex( p );
if( m_aModeChoices[sel].m_pStyle )
GAMESTATE->m_pCurStyle = m_aModeChoices[sel].m_pStyle;
+7 -9
View File
@@ -602,20 +602,18 @@ void ScreenSelectMaster::MenuStart( PlayerNumber pn )
if( SHARED_PREVIEW_AND_CURSOR || GetCurrentPage() == PAGE_2 )
{
/* Only one player has to pick. Choose this for all the other players, too. */
FOREACH_PlayerNumber( p )
if( GAMESTATE->IsHumanPlayer(p) )
{
ASSERT( !m_bChosen[p] );
fSecs = max( fSecs, DoMenuStart( (PlayerNumber)p ) );
}
FOREACH_HumanPlayer( p )
{
ASSERT( !m_bChosen[p] );
fSecs = max( fSecs, DoMenuStart(p) );
}
}
else
{
fSecs = max( fSecs, DoMenuStart(pn) );
// check to see if everyone has chosen
FOREACH_PlayerNumber( p )
if( GAMESTATE->IsHumanPlayer((PlayerNumber)p) )
bAllDone &= m_bChosen[p];
FOREACH_HumanPlayer( p )
bAllDone &= m_bChosen[p];
}
if( bAllDone )