From: Holger Schemel <info@artsoft.org>
Date: Wed, 16 Dec 2020 00:51:07 +0000 (+0100)
Subject: added setup option to show dynamite and keys in game panel for EM artwork
X-Git-Tag: 4.2.2.0~12
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=47c4aca280552f23a943a701fafeac3e9ebd0e98;p=rocksndiamonds.git

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 b2a6fb5c..ac928e8f 100644
--- 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 14dc59eb..dafe7cbf 100644
--- 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 939324ab..0e05f56f 100644
--- 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 ee53e0bf..95f05bf1 100644
--- 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:" },