Don't show graphical startup for Heretic, Hexen or Strife when running

with -testcontrols.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2399

1 files changed, 13 insertions, 10 deletions

diff --git a/src/strife/d_main.c b/src/strife/d_main.c
index 6c105484..c686eda2 100644
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -1091,7 +1091,7 @@ static void D_Endoom(void)
     // Don't show ENDOOM if we have it disabled, or we're running
     // in screensaver or control test mode.
 
-    if (!show_endoom || screensaver_mode || M_CheckParm("-testcontrols") > 0)
+    if (!show_endoom || screensaver_mode || testcontrols)
     {
         return;
     }
@@ -1319,9 +1319,18 @@ void D_DoomMain (void)
     //
     // Disable graphical introduction sequence
     //
-    
-    if (M_CheckParm("-nograph") > 0)
+
+    if (M_ParmExists("-nograph"))
+        showintro = false;
+
+    // Undocumented:
+    // Invoked by setup to test the controls.
+
+    if (M_ParmExists("-testcontrols"))
+    {
+        testcontrols = true;
         showintro = false;
+    }
 
     // haleyjd 20110206: Moved up -devparm for max visibility
 
@@ -1781,17 +1790,11 @@ void D_DoomMain (void)
         autostart = true;
     }
 
-    // Undocumented:
-    // Invoked by setup to test the controls.
-
-    p = M_CheckParm("-testcontrols");
-
-    if (p > 0)
+    if (testcontrols)
     {
         startepisode = 1;
         startmap = 1;
         autostart = true;
-        testcontrols = true;
     }
 
     // Check for load game parameter