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 fe306f03820aa7f8be92f6e158795a71cc973a13..3ca84e426106f43383d12de5137d008cf4d9a015 100644 (file)
--- 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 1a05d02af015ac16599b6c61e9e2b97c060e32a8..7b2e7a35bcb8792be9bc4e9da5dced8fba70d07c 100644 (file)
--- 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 c9ae6d094bf66680d98d720ae208ff6e7a222269..cf80f202721ec8e5e76721416f5b69490cfa5859 100644 (file)
--- 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 2de3946c0bddd929a64b312a79370d274f596bf6..7b35e8115056ea0c4022f534cade582955da02c7 100644 (file)
--- 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:"              },