commit f742664b920500cb7343ee40338ab6add6acb9a2
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Sep 24 18:10:38 2011 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sat Sep 24 18:10:38 2011 +0000
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 +++++++++---------
src/hexen/st_start.c | 2 +-
src/strife/d_main.c | 23 +++++++++++++----------
3 files changed, 23 insertions(+), 20 deletions(-)
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)
{
diff --git a/src/hexen/st_start.c b/src/hexen/st_start.c
index 897c1810..391e26a6 100644
--- a/src/hexen/st_start.c
+++ b/src/hexen/st_start.c
@@ -129,7 +129,7 @@ void ST_Init(void)
using_graphical_startup = false;
- if (graphical_startup && !debugmode)
+ if (graphical_startup && !debugmode && !testcontrols)
{
I_SetWindowTitleHR("Hexen startup - " PACKAGE_STRING);
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