syncing with sm4svn part 1.

7534867: fix SSM crashes when selecting a song with only one player enabled
cddaab5: simplify SongUtil::GetStepsTypeAndDifficultyFromSortOrder
615aab0: add Style::GetUsesCenteredArrows (doubles + routine)
17f38e7: sanity check
[all code changes by Glenn Maynard]
This commit is contained in:
AJ Kelly
2010-02-13 12:50:34 -06:00
parent 484820424b
commit a7a8b6b94d
5 changed files with 33 additions and 27 deletions
+11 -1
View File
@@ -362,7 +362,17 @@ void ScreenGameplay::Init()
ScreenWithMenuElements::Init();
this->FillPlayerInfo( m_vPlayerInfo );
ASSERT_M( !m_vPlayerInfo.empty(), "m_vPlayerInfo must be filled by FillPlayerInfo" );
{
ASSERT_M( !m_vPlayerInfo.empty(), "m_vPlayerInfo must be filled by FillPlayerInfo" );
int iNumEnabledPlayers = 0;
FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
++iNumEnabledPlayers;
/* If this is 0, we have no active players and havn't been initialized correctly. */
ASSERT( iNumEnabledPlayers > 0 );
}
/* Pause MEMCARDMAN. If a memory card is removed, we don't want to interrupt the
* player by making a noise until the game finishes. */