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/strife | |
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/strife')
-rw-r--r-- | src/strife/d_main.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/strife/d_main.c b/src/strife/d_main.c index cabd0505..51782b43 100644 --- a/src/strife/d_main.c +++ b/src/strife/d_main.c @@ -150,6 +150,10 @@ char mapdir[1024]; // directory of development maps int show_endoom = 1; int graphical_startup = 1; +// If true, startup has completed and the main game loop has started. + +static boolean main_loop_started = false; + // fraggle 06/03/11 [STRIFE]: Unused config variable, preserved // for compatibility: @@ -490,6 +494,8 @@ void D_DoomLoop (void) if (demorecording) G_BeginRecording (); + main_loop_started = true; + TryRunTics(); if (!showintro) @@ -1038,9 +1044,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 || testcontrols) + if (!show_endoom || !main_loop_started || screensaver_mode || testcontrols) { return; } |