mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-11 23:32:02 +00:00
Merge branch 'master' of c:\programming\doom\zdoom
This commit is contained in:
commit
d1f741a53d
2 changed files with 10 additions and 7 deletions
|
@ -635,11 +635,11 @@ static void ParseFloor (FScanner &sc)
|
|||
|
||||
if (!picnum.Exists())
|
||||
{
|
||||
sc.MustGetString();
|
||||
if (!opt)
|
||||
{
|
||||
Printf("Unknown flat %s\n", sc.String);
|
||||
}
|
||||
sc.MustGetString();
|
||||
return;
|
||||
}
|
||||
sc.MustGetString ();
|
||||
|
|
|
@ -688,13 +688,16 @@ FHexenStartupScreen::FHexenStartupScreen(int max_progress, HRESULT &hr)
|
|||
LayoutMainWindow (Window, NULL);
|
||||
InvalidateRect (StartupScreen, NULL, TRUE);
|
||||
|
||||
if (DoomStartupInfo.Song.IsNotEmpty())
|
||||
if (!batchrun)
|
||||
{
|
||||
S_ChangeMusic(DoomStartupInfo.Song.GetChars(), true, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
S_ChangeMusic ("orb", true, true);
|
||||
if (DoomStartupInfo.Song.IsNotEmpty())
|
||||
{
|
||||
S_ChangeMusic(DoomStartupInfo.Song.GetChars(), true, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
S_ChangeMusic("orb", true, true);
|
||||
}
|
||||
}
|
||||
hr = S_OK;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue