added setup option to show dynamite and keys in game panel for EM artwork

diff --git a/src/files.c b/src/files.c
index b2a6fb5c13f4976c8d23ffd8e3c942f69706ba4f..ac928e8f599532dc8837a180c19e37ab35d358c8 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -8545,6 +8545,10 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_SWITCH,
     &setup.prefer_lowpass_sounds,              "prefer_lowpass_sounds"
   },
+  {
+    TYPE_SWITCH,
+    &setup.prefer_extra_panel_items,           "prefer_extra_panel_items"
+  },
   {
     TYPE_SWITCH,
     &setup.game_speed_extended,                        "game_speed_extended"
@@ -9216,6 +9220,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->input_on_focus = FALSE;
   si->prefer_aga_graphics = TRUE;
   si->prefer_lowpass_sounds = FALSE;
+  si->prefer_extra_panel_items = TRUE;
   si->game_speed_extended = FALSE;
   si->game_frame_delay = GAME_FRAME_DELAY;
   si->sp_show_border_elements = FALSE;

diff --git a/src/game.c b/src/game.c
index 14dc59eb8b3d4afb3d0612acee25b480cbf53f8b..dafe7cbfc56f3c67706a06989e63ba845da56c94 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -2626,6 +2626,10 @@ static void DisplayGameControlValues(void)
     if (PANEL_DEACTIVATED(pos))
       continue;
 
+    if (pos->class == get_hash_from_key("extra_panel_items") &&
+       !setup.prefer_extra_panel_items)
+      continue;
+
     gpc->last_value = value;
     gpc->last_frame = frame;
 

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 939324abe37f4782b4791126d3c7985dba983d53..0e05f56f9675547f0231727e8b6c7dc0a5131a5d 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -1434,6 +1434,7 @@ struct SetupInfo
   boolean input_on_focus;
   boolean prefer_aga_graphics;
   boolean prefer_lowpass_sounds;
+  boolean prefer_extra_panel_items;
   boolean game_speed_extended;
   int game_frame_delay;
   boolean sp_show_border_elements;

diff --git a/src/screens.c b/src/screens.c
index ee53e0bff80341528592124d4d84a82899bf5500..95f05bf10b337eae5f82094f27ca0a2bb5d79573 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -6694,6 +6694,7 @@ static struct TokenInfo setup_info_engines[] =
   { TYPE_SWITCH,       &setup.forced_scroll_delay, "Scroll Delay:"     },
   { TYPE_ECS_AGA,      &setup.prefer_aga_graphics, "Amiga Graphics Chipset:" },
   { TYPE_SWITCH,       &setup.prefer_lowpass_sounds,"Low-Pass Filter Sounds:" },
+  { TYPE_SWITCH,       &setup.prefer_extra_panel_items,"Show Dynamite and Keys:" },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_HEADLINE,     NULL,                   "Supaplex"              },
   { TYPE_SWITCH,       &setup.sp_show_border_elements, "Border Elements:" },