shithub: choc

Info  •  Files  •  Log  •  Branches

Add graphical_startup option for Strife (to match Heretic/Hexen).

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

--- a/src/setup/display.c

+++ b/src/setup/display.c

@@ -606,7 +606,7 @@

                                                  &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 @@

         M_BindVariable("show_endoom",               &show_endoom);

     }

-    if (gamemission == heretic || gamemission == hexen)

+    if (gamemission == heretic || gamemission == hexen || gamemission == strife)

     {

         M_BindVariable("graphical_startup",        &graphical_startup);

     }

--- a/src/strife/d_main.c

+++ b/src/strife/d_main.c

@@ -149,6 +149,7 @@

 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 @@

     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);

@@ -1570,6 +1572,11 @@

     M_SetConfigFilenames("strife.cfg", PROGRAM_PREFIX "strife.cfg");

     D_BindVariables();

     M_LoadDefaults();

+

+    if (!graphical_startup)

+    {

+        showintro = false;

+    }

     // Save configuration at exit.

     I_AtExit(M_SaveDefaults, false);