From 387a7d29932c36a99b4efaaa7dd2fc393b11578c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 25 Sep 2003 04:55:46 +0000 Subject: [PATCH] Always require at least one character definition. --- stepmania/src/GameState.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 95b63e31be..e9afa5fc81 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -190,6 +190,9 @@ void GameState::ReloadCharacters() else delete pChar; } + + if( !m_pCharacters.size() ) + RageException::Throw( "Couldn't find any character definitions" ); } const float GameState::MUSIC_SECONDS_INVALID = -5000.0f; @@ -311,13 +314,6 @@ bool GameState::IsPlayable( const ModeChoice& mc ) return false; } - if( mc.pm == PLAY_MODE_RAVE || mc.pm == PLAY_MODE_BATTLE ) - { - // Can't play Rave without characters for attack definitions. - if( m_pCharacters.empty() ) - return false; - } - /* Don't set a PlayMode that's incompatible with our current Style (if any), * and vice versa. */ const PlayMode &rPlayMode = mc.pm != PLAY_MODE_INVALID? mc.pm:m_PlayMode;