added new config file options to hide shortcuts sub-menus

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 247d24bba991d2c0de1fdfdc5743415267a029fd..5a559b1444fd36189d967bd88554a9d0ae7859af 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -7138,7 +7138,12 @@ static void ToggleUseApiServerIfNeeded(void)
   runtime.use_api_server = setup.use_api_server;
 
   if (runtime.use_api_server)
+  {
+    if (setup.has_remaining_tapes)
+      setup.ask_for_uploading_tapes = TRUE;
+
     CheckApiServerTasks();
+  }
 }
 
 static void ModifyGameSpeedIfNeeded(void)
@@ -7188,6 +7193,9 @@ static struct
   void *related_value;
 } hide_related_entry_list[] =
 {
+  { &setup.network_server_hostname,    execGadgetNetworkServer         },
+  { &setup.network_server_hostname,    &network_server_text            },
+
   { &setup.scores_in_highscore_list,   execSetupChooseScoresType       },
   { &setup.scores_in_highscore_list,   &scores_type_text               },
 
@@ -7266,6 +7274,12 @@ static struct
   { &setup.internal.menu_exit,         execExitSetup                   },
   { &setup.internal.menu_save_and_exit,        execSaveAndExitSetup            },
 
+  { &setup.internal.menu_shortcuts_various,    execSetupShortcuts1     },
+  { &setup.internal.menu_shortcuts_focus,      execSetupShortcuts2     },
+  { &setup.internal.menu_shortcuts_tape,       execSetupShortcuts3     },
+  { &setup.internal.menu_shortcuts_sound,      execSetupShortcuts4     },
+  { &setup.internal.menu_shortcuts_snap,       execSetupShortcuts5     },
+
   { &setup.internal.info_title,                execInfoTitleScreen             },
   { &setup.internal.info_elements,     execInfoElements                },
   { &setup.internal.info_music,                execInfoMusic                   },
@@ -7677,7 +7691,7 @@ static Key getSetupKey(void)
       {
         case EVENT_KEYPRESS:
          {
-           key = GetEventKey((KeyEvent *)&event, TRUE);
+           key = GetEventKey((KeyEvent *)&event);
 
            // press 'Escape' or 'Enter' to keep the existing key binding
            if (key == KSYM_Escape || key == KSYM_Return)
@@ -8474,7 +8488,7 @@ static boolean CustomizeKeyboardMain(int player_nr)
       {
         case EVENT_KEYPRESS:
          {
-           Key key = GetEventKey((KeyEvent *)&event, FALSE);
+           Key key = GetEventKey((KeyEvent *)&event);
 
            // press 'Escape' to abort and keep the old key bindings
            if (key == KSYM_Escape)
@@ -9125,7 +9139,7 @@ static boolean ConfigureVirtualButtonsMain(void)
 
         case EVENT_KEYPRESS:
          {
-           Key key = GetEventKey((KeyEvent *)&event, FALSE);
+           Key key = GetEventKey((KeyEvent *)&event);
 
            action = (key == KSYM_Escape ?      ACTION_ESCAPE :
                      key == KSYM_BackSpace ||