summaryrefslogtreecommitdiff
path: root/src/heretic
diff options
context:
space:
mode:
authorSimon Howard2011-09-24 18:10:38 +0000
committerSimon Howard2011-09-24 18:10:38 +0000
commitf742664b920500cb7343ee40338ab6add6acb9a2 (patch)
tree33cd88ad72862f4d7fc72025deaae4cd930a1d82 /src/heretic
parent9af0a3c8fd56dcf170698c3867a376a822f39d08 (diff)
downloadchocolate-doom-f742664b920500cb7343ee40338ab6add6acb9a2.tar.gz
chocolate-doom-f742664b920500cb7343ee40338ab6add6acb9a2.tar.bz2
chocolate-doom-f742664b920500cb7343ee40338ab6add6acb9a2.zip
Don't show graphical startup for Heretic, Hexen or Strife when running
with -testcontrols. Subversion-branch: /branches/v2-branch Subversion-revision: 2399
Diffstat (limited to 'src/heretic')
-rw-r--r--src/heretic/d_main.c18
1 files changed, 9 insertions, 9 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)
{