summaryrefslogtreecommitdiff
path: root/src/strife/d_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/strife/d_main.c')
-rw-r--r--src/strife/d_main.c12
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;
}