Always require at least one character definition.
This commit is contained in:
@@ -190,6 +190,9 @@ void GameState::ReloadCharacters()
|
|||||||
else
|
else
|
||||||
delete pChar;
|
delete pChar;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( !m_pCharacters.size() )
|
||||||
|
RageException::Throw( "Couldn't find any character definitions" );
|
||||||
}
|
}
|
||||||
|
|
||||||
const float GameState::MUSIC_SECONDS_INVALID = -5000.0f;
|
const float GameState::MUSIC_SECONDS_INVALID = -5000.0f;
|
||||||
@@ -311,13 +314,6 @@ bool GameState::IsPlayable( const ModeChoice& mc )
|
|||||||
return false;
|
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),
|
/* Don't set a PlayMode that's incompatible with our current Style (if any),
|
||||||
* and vice versa. */
|
* and vice versa. */
|
||||||
const PlayMode &rPlayMode = mc.pm != PLAY_MODE_INVALID? mc.pm:m_PlayMode;
|
const PlayMode &rPlayMode = mc.pm != PLAY_MODE_INVALID? mc.pm:m_PlayMode;
|
||||||
|
|||||||
Reference in New Issue
Block a user