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

simplify, use GetNextScreen

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-20 06:41:15 +00:00
parent f1f76f4c75
commit 409bc25090
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelect.cpp
+3 -7
View File
@@ -201,9 +201,7 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
if( bAllPlayersChoseTheSame )
{
const GameCommand &gc = m_aGameCommands[iMastersIndex];
CString sThisScreen = gc.m_sScreen;
if( m_sNextScreen == "" )
m_sNextScreen = sThisScreen;
m_sNextScreen = gc.m_sScreen;
gc.ApplyToAllPlayers();
}
else
@@ -212,9 +210,7 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
{
int iIndex = this->GetSelectionIndex(p);
const GameCommand &gc = m_aGameCommands[iIndex];
CString sThisScreen = gc.m_sScreen;
if( m_sNextScreen == "" )
m_sNextScreen = sThisScreen;
m_sNextScreen = gc.m_sScreen;
gc.Apply( p );
}
}
@@ -239,7 +235,7 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
if( !IsTransitioning() )
StartTransitioningScreen( SM_GoToNextScreen );
SCREENMAN->ConcurrentlyPrepareScreen( m_sNextScreen );
SCREENMAN->ConcurrentlyPrepareScreen( GetNextScreen() );
}
else if( SM == SM_GoToNextScreen )
{