zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-30 23:51:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of c:\programming\doom\zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-02-09 15:07:16 +01:00
commit d1f741a53d
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_terrain.cpp
View file

@ -635,11 +635,11 @@ static void ParseFloor (FScanner &sc)
if (!picnum.Exists()) if (!picnum.Exists())
{ {
sc.MustGetString();
if (!opt) if (!opt)
{ {
Printf("Unknown flat %s\n", sc.String); Printf("Unknown flat %s\n", sc.String);
} }
sc.MustGetString();
return; return;
} }
sc.MustGetString (); sc.MustGetString ();

15
src/win32/st_start.cpp
View file

@ -688,13 +688,16 @@ FHexenStartupScreen::FHexenStartupScreen(int max_progress, HRESULT &hr)
LayoutMainWindow (Window, NULL); LayoutMainWindow (Window, NULL);
InvalidateRect (StartupScreen, NULL, TRUE); InvalidateRect (StartupScreen, NULL, TRUE);
if (DoomStartupInfo.Song.IsNotEmpty()) if (!batchrun)
{ {
S_ChangeMusic(DoomStartupInfo.Song.GetChars(), true, true); if (DoomStartupInfo.Song.IsNotEmpty())
} {
else S_ChangeMusic(DoomStartupInfo.Song.GetChars(), true, true);
{ }
S_ChangeMusic ("orb", true, true); else
{
S_ChangeMusic("orb", true, true);
}
} }
hr = S_OK; hr = S_OK;
} }