Fix credits messages between screens

This commit is contained in:
Glenn Maynard
2003-11-05 19:55:28 +00:00
parent 5e8ebeda43
commit 3ae2c7dca0
+5 -1
View File
@@ -111,7 +111,11 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
{ {
case SM_AllDoneChoosing: case SM_AllDoneChoosing:
{ {
GAMESTATE->m_bPlayersCanJoin = ( GAMESTATE->m_CurStyle == STYLE_INVALID );
const int iSelectionIndex = GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber);
if( m_aModeChoices[iSelectionIndex].m_style != STYLE_INVALID )
GAMESTATE->m_bPlayersCanJoin = false; GAMESTATE->m_bPlayersCanJoin = false;
SCREENMAN->RefreshCreditsMessages(); SCREENMAN->RefreshCreditsMessages();
if( !m_Menu.IsTransitioning() ) if( !m_Menu.IsTransitioning() )
@@ -138,7 +142,7 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
if( GAMESTATE->IsHumanPlayer(p) ) if( GAMESTATE->IsHumanPlayer(p) )
m_aModeChoices[this->GetSelectionIndex((PlayerNumber)p)].Apply( (PlayerNumber)p ); m_aModeChoices[this->GetSelectionIndex((PlayerNumber)p)].Apply( (PlayerNumber)p );
int iSelectionIndex = GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber); const int iSelectionIndex = GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber);
if( m_aModeChoices[iSelectionIndex].m_sScreen != "" ) if( m_aModeChoices[iSelectionIndex].m_sScreen != "" )
SCREENMAN->SetNewScreen( m_aModeChoices[iSelectionIndex ].m_sScreen ); SCREENMAN->SetNewScreen( m_aModeChoices[iSelectionIndex ].m_sScreen );
else else