ref: f742664b920500cb7343ee40338ab6add6acb9a2
parent: 9af0a3c8fd56dcf170698c3867a376a822f39d08
author: Simon Howard <[email protected]>
date: Sat Sep 24 14:10:38 EDT 2011
Don't show graphical startup for Heretic, Hexen or Strife when running with -testcontrols. Subversion-branch: /branches/v2-branch Subversion-revision: 2399
--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
@@ -625,7 +625,7 @@
byte *textScreen;
byte *loading;
- if (!graphical_startup || debugmode)
+ if (!graphical_startup || debugmode || testcontrols)
{
using_graphical_startup = false;
return;
@@ -943,6 +943,14 @@
I_PrintStartupBanner(gamedescription);
+ if (M_ParmExists("-testcontrols"))
+ {
+ startepisode = 1;
+ startmap = 1;
+ autostart = true;
+ testcontrols = true;
+ }
+
// haleyjd: removed WATCOMC
initStartup();
@@ -1039,14 +1047,6 @@
filename = SV_Filename(myargv[p + 1][0] - '0');
G_LoadGame(filename);
free(filename);
- }
-
- if (M_ParmExists("-testcontrols"))
- {
- startepisode = 1;
- startmap = 1;
- autostart = true;
- testcontrols = true;
}
// Check valid episode and map
--- a/src/hexen/st_start.c
+++ b/src/hexen/st_start.c
@@ -129,7 +129,7 @@
using_graphical_startup = false;
- if (graphical_startup && !debugmode)
+ if (graphical_startup && !debugmode && !testcontrols)
{
I_SetWindowTitleHR("Hexen startup - " PACKAGE_STRING);
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -1091,7 +1091,7 @@
// 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,10 +1319,19 @@
//
// 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 @@
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