From f742664b920500cb7343ee40338ab6add6acb9a2 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 24 Sep 2011 18:10:38 +0000
Subject: Don't show graphical startup for Heretic, Hexen or Strife when
 running with -testcontrols.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2399
---
 src/heretic/d_main.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/heretic')

diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
index 62e4892e..9c282491 100644
--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
@@ -625,7 +625,7 @@ void initStartup(void)
     byte *textScreen;
     byte *loading;
 
-    if (!graphical_startup || debugmode)
+    if (!graphical_startup || debugmode || testcontrols)
     {
         using_graphical_startup = false;
         return;
@@ -943,6 +943,14 @@ void D_DoomMain(void)
 
     I_PrintStartupBanner(gamedescription);
 
+    if (M_ParmExists("-testcontrols"))
+    {
+        startepisode = 1;
+        startmap = 1;
+        autostart = true;
+        testcontrols = true;
+    }
+
     // haleyjd: removed WATCOMC
     initStartup();
 
@@ -1041,14 +1049,6 @@ void D_DoomMain(void)
 	free(filename);
     }
 
-    if (M_ParmExists("-testcontrols"))
-    {
-        startepisode = 1;
-        startmap = 1;
-        autostart = true;
-        testcontrols = true;
-    }
-
     // Check valid episode and map
     if (autostart || netgame)
     {
-- 
cgit v1.2.3