From: Holger Schemel Date: Sat, 9 Feb 2019 00:45:47 +0000 (+0100) Subject: added hiding complete setup sub-menus marked with '.hide' X-Git-Tag: 4.1.2.0~23 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=9a2dd50332a4973a75ec1b7829e2155b99cc20ed;p=rocksndiamonds.git added hiding complete setup sub-menus marked with '.hide' --- diff --git a/src/files.c b/src/files.c index c2150acd..6b0aea9e 100644 --- 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 f498816e..35accfe2 100644 --- 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 bd59b4cd..175bae6f 100644 --- 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 } };