From: Holger Schemel <info@artsoft.org>
Date: Wed, 5 Feb 2025 22:52:07 +0000 (+0100)
Subject: changed setup option for extra game panel items to be more generic
X-Git-Tag: 4.4.0.4~8
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=28c6b65d619a2c06e9f28a5312904e5d86f0543a;p=rocksndiamonds.git

changed setup option for extra game panel items to be more generic

In addition, the default value was changed to "false" to show classic
game panels by default.
---

diff --git a/src/files.c b/src/files.c
index fe306f03..3ca84e42 100644
--- a/src/files.c
+++ b/src/files.c
@@ -11040,7 +11040,7 @@ static struct TokenInfo global_setup_tokens[] =
   },
   {
     TYPE_SWITCH,
-    &setup.prefer_extra_panel_items,		"prefer_extra_panel_items"
+    &setup.show_extra_panel_items,		"show_extra_panel_items"
   },
   {
     TYPE_SWITCH,
@@ -11974,7 +11974,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->show_extra_panel_items = FALSE;
   si->game_speed_extended = FALSE;
   si->game_frame_delay = GAME_FRAME_DELAY;
   si->default_game_engine_type	= GAME_ENGINE_TYPE_RND;
diff --git a/src/game.c b/src/game.c
index 1a05d02a..7b2e7a35 100644
--- a/src/game.c
+++ b/src/game.c
@@ -83,8 +83,8 @@
 
 #define PANEL_OFF()		(game.panel.active == FALSE)
 #define	PANEL_DEACTIVATED(p)	((p)->x < 0 || (p)->y < 0 || PANEL_OFF())
-#define PANEL_XOFFSET(p)	(setup.prefer_extra_panel_items ? (p)->xoffset2 : 0)
-#define PANEL_YOFFSET(p)	(setup.prefer_extra_panel_items ? (p)->yoffset2 : 0)
+#define PANEL_XOFFSET(p)	(setup.show_extra_panel_items ? (p)->xoffset2 : 0)
+#define PANEL_YOFFSET(p)	(setup.show_extra_panel_items ? (p)->yoffset2 : 0)
 #define PANEL_XPOS(p)		(DX + ALIGNED_TEXT_XPOS(p) + PANEL_XOFFSET(p))
 #define PANEL_YPOS(p)		(DY + ALIGNED_TEXT_YPOS(p) + PANEL_YOFFSET(p))
 
@@ -3057,7 +3057,7 @@ static void DisplayGameControlValues(void)
       continue;
 
     if (hasClass(pos->class, CLASS_EXTRA_PANEL_ITEMS) &&
-	!setup.prefer_extra_panel_items)
+	!setup.show_extra_panel_items)
       continue;
 
     if (hasClass(pos->class, CLASS_BD_PRE_HATCHING) &&
diff --git a/src/libgame/system.h b/src/libgame/system.h
index c9ae6d09..cf80f202 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -1592,7 +1592,7 @@ struct SetupInfo
   boolean input_on_focus;
   boolean prefer_aga_graphics;
   boolean prefer_lowpass_sounds;
-  boolean prefer_extra_panel_items;
+  boolean show_extra_panel_items;
   boolean game_speed_extended;
   int game_frame_delay;
   int default_game_engine_type;
diff --git a/src/screens.c b/src/screens.c
index 2de3946c..7b35e811 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -8578,6 +8578,7 @@ static struct TokenInfo setup_info_engines[] =
   { TYPE_STRING,	&game_engine_type_text,		""				},
   { TYPE_EMPTY,		NULL,				""				},
   { TYPE_ECS_AGA,	&setup.prefer_aga_graphics,	"Game Graphics Style:"		},
+  { TYPE_SWITCH,	&setup.show_extra_panel_items,	"Show Extra Panel Items:"	},
   { TYPE_EMPTY,		NULL,				""				},
   { TYPE_HEADLINE,	NULL,				"Boulder Dash"			},
   { TYPE_SWITCH,	&setup.bd_multiple_lives,	"Play with multiple lives:"	},
@@ -8602,7 +8603,6 @@ static struct TokenInfo setup_info_engines[] =
   { TYPE_HEADLINE,	NULL,				"Emerald Mine"			},
   { TYPE_SWITCH,	&setup.forced_scroll_delay,	"Scroll Delay:"			},
   { 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:"		},