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

fix screens not set when reused

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-21 17:14:43 +00:00
parent 03bd6b100b
commit 1c158bcc6c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelect.cpp
+4 -2
View File
@@ -194,9 +194,11 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
} }
} }
/* When applying, do make a copy of the GameCommand. That way,
* GetAndClearScreen doesn't mangle m_sScreen on our real copy. */
if( bAllPlayersChoseTheSame ) if( bAllPlayersChoseTheSame )
{ {
GameCommand &gc = m_aGameCommands[iMastersIndex]; GameCommand gc = m_aGameCommands[iMastersIndex];
CString sThisScreen = gc.GetAndClearScreen(); CString sThisScreen = gc.GetAndClearScreen();
if( m_sNextScreen == "" ) if( m_sNextScreen == "" )
m_sNextScreen = sThisScreen; m_sNextScreen = sThisScreen;
@@ -207,7 +209,7 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
{ {
int iIndex = this->GetSelectionIndex(p); int iIndex = this->GetSelectionIndex(p);
GameCommand &gc = m_aGameCommands[iIndex]; GameCommand gc = m_aGameCommands[iIndex];
CString sThisScreen = gc.GetAndClearScreen(); CString sThisScreen = gc.GetAndClearScreen();
if( m_sNextScreen == "" ) if( m_sNextScreen == "" )
m_sNextScreen = sThisScreen; m_sNextScreen = sThisScreen;