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/heretic | |
| 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/heretic')
| -rw-r--r-- | src/heretic/d_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c index 8ca49ba6..6dc29cf7 100644 --- a/src/heretic/d_main.c +++ b/src/heretic/d_main.c @@ -79,6 +79,7 @@ int startmap; int UpdateState; static int graphical_startup = 1; static boolean using_graphical_startup; +static boolean main_loop_started = false; boolean autostart; extern boolean automapactive; @@ -254,6 +255,8 @@ void D_DoomLoop(void) I_InitGraphics(); I_SetGrabMouseCallback(D_GrabMouseCallback); + main_loop_started = true; + while (1) { // Frame syncronous IO operations @@ -782,7 +785,7 @@ static void D_Endoom(void) // Disable ENDOOM? - if (!show_endoom || testcontrols) + if (!show_endoom || testcontrols || !main_loop_started) { return; } |