Skipping screens at the screen level is illegal; leave it up to the theme. Added assert as well.
This commit is contained in:
@@ -59,28 +59,7 @@ void ScreenSelectCharacter::Init()
|
|||||||
|
|
||||||
vector<Character*> apCharacters;
|
vector<Character*> apCharacters;
|
||||||
GAMESTATE->GetCharacters( apCharacters );
|
GAMESTATE->GetCharacters( apCharacters );
|
||||||
if( apCharacters.empty() )
|
ASSERT_M( !apCharacters.empty(), "No characters are available" );
|
||||||
{
|
|
||||||
this->PostScreenMessage( SM_GoToNextScreen, 0 );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch( GAMESTATE->m_PlayMode )
|
|
||||||
{
|
|
||||||
// For Rave/Battle mode, we force the players to select characters
|
|
||||||
// (by not returning in this switch)
|
|
||||||
case PLAY_MODE_BATTLE:
|
|
||||||
case PLAY_MODE_RAVE:
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
/* Non Rave/Battle mode, just skip this screen if disabled. */
|
|
||||||
if( PREFSMAN->m_ShowDancingCharacters != PrefsManager::CO_SELECT )
|
|
||||||
{
|
|
||||||
this->PostScreenMessage( SM_GoToNextScreen, 0 );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
FOREACH_PlayerNumber( p )
|
FOREACH_PlayerNumber( p )
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user