diff options
author | Simon Howard | 2013-09-04 04:07:51 +0000 |
---|---|---|
committer | Simon Howard | 2013-09-04 04:07:51 +0000 |
commit | 466e09152f9fd24dfb24fcdf6b95731ae9e0f4ed (patch) | |
tree | b40d450e1ce0133bfe2223b1e93534917001c57e /src/doom/d_main.c | |
parent | 4e4f77f13ef73ad62dc96b3f9bcac7f01697196a (diff) | |
download | chocolate-doom-466e09152f9fd24dfb24fcdf6b95731ae9e0f4ed.tar.gz chocolate-doom-466e09152f9fd24dfb24fcdf6b95731ae9e0f4ed.tar.bz2 chocolate-doom-466e09152f9fd24dfb24fcdf6b95731ae9e0f4ed.zip |
Don't show ENDOOM screen when aborting netgame startup (thanks Alexandre
Xavier).
Subversion-branch: /branches/v2-branch
Subversion-revision: 2635
Diffstat (limited to 'src/doom/d_main.c')
-rw-r--r-- | src/doom/d_main.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/doom/d_main.c b/src/doom/d_main.c index 9f8b806c..eb36f4bb 100644 --- a/src/doom/d_main.c +++ b/src/doom/d_main.c @@ -128,6 +128,9 @@ boolean storedemo; // "BFG Edition" version of doom2.wad does not include TITLEPIC. boolean bfgedition; +// If true, the main game loop has started. +boolean main_loop_started = false; + char wadfile[1024]; // primary wad file char mapdir[1024]; // directory of development maps @@ -416,7 +419,9 @@ void D_DoomLoop (void) { if (demorecording) G_BeginRecording (); - + + main_loop_started = true; + TryRunTics(); I_SetWindowTitle(gamedescription); @@ -1024,9 +1029,11 @@ static void D_Endoom(void) byte *endoom; // Don't show ENDOOM if we have it disabled, or we're running - // in screensaver or control test mode. + // in screensaver or control test mode. Only show it once the + // game has actually started. - if (!show_endoom || screensaver_mode || M_CheckParm("-testcontrols") > 0) + if (!show_endoom || !main_loop_started + || screensaver_mode || M_CheckParm("-testcontrols") > 0) { return; } |