From 6ee44d364659f1d2b4c43c2bdad276c667ae1907 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 26 Sep 2011 21:34:13 +0000
Subject: Add graphical_startup option for Strife (to match Heretic/Hexen).

Subversion-branch: /branches/v2-branch
Subversion-revision: 2408
---
 src/setup/display.c | 4 ++--
 src/strife/d_main.c | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/setup/display.c b/src/setup/display.c
index d9b34ccc..ebd747e0 100644
--- a/src/setup/display.c
+++ b/src/setup/display.c
@@ -606,7 +606,7 @@ static void AdvancedDisplayConfig(TXT_UNCAST_ARG(widget),
                                                  &aspect_ratio_correct),
                    NULL);
 
-    if (gamemission == heretic || gamemission == hexen)
+    if (gamemission == heretic || gamemission == hexen || gamemission == strife)
     {
         TXT_AddWidget(window,
                       TXT_NewCheckBox("Graphical startup", &graphical_startup));
@@ -798,7 +798,7 @@ void BindDisplayVariables(void)
         M_BindVariable("show_endoom",               &show_endoom);
     }
 
-    if (gamemission == heretic || gamemission == hexen)
+    if (gamemission == heretic || gamemission == hexen || gamemission == strife)
     {
         M_BindVariable("graphical_startup",        &graphical_startup);
     }
diff --git a/src/strife/d_main.c b/src/strife/d_main.c
index 45e5f0f3..f570d841 100644
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -149,6 +149,7 @@ char		wadfile[1024];          // primary wad file
 char		mapdir[1024];           // directory of development maps
 
 int             show_endoom = 1;
+int             graphical_startup = 1;
 
 // fraggle 06/03/11 [STRIFE]: Unused config variable, preserved
 // for compatibility:
@@ -442,6 +443,7 @@ void D_BindVariables(void)
     M_BindVariable("vanilla_demo_limit",     &vanilla_demo_limit);
     M_BindVariable("show_endoom",            &show_endoom);
     M_BindVariable("back_flat",              &back_flat);
+    M_BindVariable("graphical_startup",      &graphical_startup);
 
     M_BindVariable("nickname",               &nickname);
     M_BindVariable("comport",                &comport);
@@ -1571,6 +1573,11 @@ void D_DoomMain (void)
     D_BindVariables();
     M_LoadDefaults();
 
+    if (!graphical_startup)
+    {
+        showintro = false;
+    }
+
     // Save configuration at exit.
     I_AtExit(M_SaveDefaults, false);
 
-- 
cgit v1.2.3