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

Fix screens loaded from ScreenSelect being loaded two or three times.

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-29 21:50:47 +00:00
parent de1f953b91
commit db20d39418
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelect.cpp
+16 -5
View File
@@ -203,9 +203,18 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
{ {
/* Apply here, not in SM_AllDoneChoosing, because applying can take a very /* Apply here, not in SM_AllDoneChoosing, because applying can take a very
* long time (200+ms), and at SM_AllDoneChoosing, we're still tweening stuff * long time (200+ms), and at SM_AllDoneChoosing, we're still tweening stuff
* off-screen. */ * off-screen.
*
* Hack: only apply one Screen. */
CString sScreen;
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
m_aGameCommands[this->GetSelectionIndex(p)].Apply( p ); {
GameCommand gc = m_aGameCommands[this->GetSelectionIndex(p)];
if( sScreen == "" )
sScreen = gc.m_sScreen;
gc.m_sScreen = "";
gc.Apply( p );
}
// //
// Finalize players if we set a style on this screen. // Finalize players if we set a style on this screen.
@@ -220,11 +229,13 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
} }
} }
const int iSelectionIndex = GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber); if( sScreen != "" )
if( m_aGameCommands[iSelectionIndex].m_sScreen != "" ) SCREENMAN->SetNewScreen( sScreen );
SCREENMAN->SetNewScreen( m_aGameCommands[iSelectionIndex].m_sScreen );
else else
{
const int iSelectionIndex = GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber);
SCREENMAN->SetNewScreen( NEXT_SCREEN(iSelectionIndex) ); SCREENMAN->SetNewScreen( NEXT_SCREEN(iSelectionIndex) );
}
} }
return; return;
} }