added hiding complete setup sub-menus marked with '.hide'

diff --git a/src/files.c b/src/files.c
index c2150acd6a3d02a0d0a1be9fea9266775b53ea7b..6b0aea9e02790fff049f2736fe1f53d8b5553187 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -8951,6 +8951,46 @@ static struct TokenInfo internal_setup_tokens[] =
     TYPE_INTEGER,
     &setup.internal.default_window_height,     "default_window_height"
   },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.menu_game,                 "menu_game"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.menu_editor,               "menu_editor"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.menu_graphics,             "menu_graphics"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.menu_sound,                        "menu_sound"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.menu_artwork,              "menu_artwork"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.menu_input,                        "menu_input"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.menu_touch,                        "menu_touch"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.menu_shortcuts,            "menu_shortcuts"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.menu_exit,                 "menu_exit"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.menu_save_and_exit,                "menu_save_and_exit"
+  },
 };
 
 static struct TokenInfo debug_setup_tokens[] =

diff --git a/src/libgame/system.h b/src/libgame/system.h
index f498816e9c94351dfd8e2cbeafac022680f1df43..35accfe28eb0d15f9188a38828774405b3c1cdca 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -1290,6 +1290,17 @@ struct SetupInternalInfo
 
   boolean choose_from_top_leveldir;
   boolean show_scaling_in_title;
+
+  boolean menu_game;
+  boolean menu_editor;
+  boolean menu_graphics;
+  boolean menu_sound;
+  boolean menu_artwork;
+  boolean menu_input;
+  boolean menu_touch;
+  boolean menu_shortcuts;
+  boolean menu_exit;
+  boolean menu_save_and_exit;
 };
 
 struct SetupDebugInfo

diff --git a/src/screens.c b/src/screens.c
index bd59b4cd4d8c46493fdf78c4dff95d1624c069bd..175bae6f743fd39421c5939cff067d5329c8b7cf 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -6164,6 +6164,17 @@ static struct
   { &setup.touch.grid_ysize[1],                execSetupChooseGridYSize_1      },
   { &setup.touch.grid_ysize[1],                &grid_size_text[1][1]           },
 
+  { &setup.internal.menu_game,         execSetupGame                   },
+  { &setup.internal.menu_editor,       execSetupEditor                 },
+  { &setup.internal.menu_graphics,     execSetupGraphics               },
+  { &setup.internal.menu_sound,                execSetupSound                  },
+  { &setup.internal.menu_artwork,      execSetupArtwork                },
+  { &setup.internal.menu_input,                execSetupInput                  },
+  { &setup.internal.menu_touch,                execSetupTouch                  },
+  { &setup.internal.menu_shortcuts,    execSetupShortcuts              },
+  { &setup.internal.menu_exit,         execExitSetup                   },
+  { &setup.internal.menu_save_and_exit,        execSaveAndExitSetup            },
+
   { NULL,                              NULL                            }
 };