make the character select screen optional for modes that don't require a character.

This commit is contained in:
Thad Ward
2003-08-27 02:48:32 +00:00
parent bccafc6bec
commit 1a6d60a6f1
5 changed files with 12 additions and 9 deletions
+3 -1
View File
@@ -20,6 +20,7 @@
#include "AnnouncerManager.h"
#include "GameState.h"
#include "Character.h"
#include "PrefsManager.h"
#define TITLE_ON_COMMAND( p ) THEME->GetMetric ("ScreenSelectCharacter",ssprintf("TitleP%dOnCommand",p+1))
@@ -53,7 +54,8 @@ ScreenSelectCharacter::ScreenSelectCharacter() : Screen("ScreenSelectCharacter")
{
LOG->Trace( "ScreenSelectCharacter::ScreenSelectCharacter()" );
if( GAMESTATE->m_pCharacters.empty() )
if( GAMESTATE->m_pCharacters.empty() ||
(GAMESTATE->m_PlayMode != PLAY_MODE_BATTLE && GAMESTATE->m_PlayMode != PLAY_MODE_RAVE && PREFSMAN->m_ShowDancingCharacters != PrefsManager::CO_SELECT ))
{
HandleScreenMessage( SM_GoToNextScreen );
return;