- Fixed: changemap allowed changing the map in "demo mode."

- Fixed: Crash when using the console at the title screen.

SVN r4182 (trunk)
This commit is contained in:
Braden Obrzut 2013-03-15 21:41:01 +00:00
parent b0203c9f1d
commit b096c7a82f
2 changed files with 2 additions and 2 deletions

View file

@ -329,7 +329,7 @@ CCMD (hxvisit)
CCMD (changemap)
{
if (who == NULL)
if (who == NULL || !usergame)
{
Printf ("Use the map command when not in a game.\n");
return;

View file

@ -448,7 +448,7 @@ void S_Start ()
// Don't start the music if loading a savegame, because the music is stored there.
// Don't start the music if revisiting a level in a hub for the same reason.
if (!savegamerestore && (level.info->snapshot == NULL || !level.info->isValid()))
if (!savegamerestore && (level.info == NULL || level.info->snapshot == NULL || !level.info->isValid()))
{
if (level.cdtrack == 0 || !S_ChangeCDMusic (level.cdtrack, level.cdid))
S_ChangeMusic (level.Music, level.musicorder);