From 0d2a61a897f12891c65bbbc4e98348349232adbe Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Wed, 21 Feb 2024 15:40:50 +0100
Subject: [PATCH] change "flashing keyed doors" to "color keyed doors" (#1526)

Fixes #1502
---
 src/am_map.c | 9 +++++++--
 src/am_map.h | 8 +++++++-
 src/m_menu.c | 9 ++++++++-
 src/m_misc.c | 8 ++++----
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/am_map.c b/src/am_map.c
index c6815498..ce74d653 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -77,7 +77,7 @@ int mapcolor_enemy;   // enemy sprite color
 //jff 3/9/98 add option to not show secret sectors until entered
 int map_secret_after;
 
-int map_keyed_door_flash; // keyed doors are flashing
+int map_keyed_door; // keyed doors are colored or flashing
 
 int map_smooth_lines;
 
@@ -1543,6 +1543,11 @@ static void AM_drawGrid(int color)
 //
 static int AM_DoorColor(int type)
 {
+  if (map_keyed_door == MAP_KEYED_DOOR_OFF)
+  {
+    return -1;
+  }
+
   if (GenLockedBase <= type && type< GenDoorBase)
   {
     type -= GenLockedBase;
@@ -1589,7 +1594,7 @@ static void AM_drawWalls(void)
   int i;
   static mline_t l;
 
-  const boolean keyed_door_flash = map_keyed_door_flash && (leveltime & 16);
+  const boolean keyed_door_flash = (map_keyed_door == MAP_KEYED_DOOR_FLASH) && (leveltime & 16);
 
   // draw the unclipped visible portions of all lines
   for (i=0;i<numlines;i++)
diff --git a/src/am_map.h b/src/am_map.h
index 33b19b12..0ef79509 100644
--- a/src/am_map.h
+++ b/src/am_map.h
@@ -107,7 +107,13 @@ extern int mapcolor_preset;
 //jff 3/9/98
 extern int map_secret_after;  // secrets do not appear til after bagged
 
-extern int map_keyed_door_flash; // keyed doors are flashing
+enum {
+  MAP_KEYED_DOOR_OFF,
+  MAP_KEYED_DOOR_COLOR,
+  MAP_KEYED_DOOR_FLASH
+};
+
+extern int map_keyed_door; // keyed doors are colored or flashing
 
 extern int map_smooth_lines;
 
diff --git a/src/m_menu.c b/src/m_menu.c
index df653378..3dc03c68 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1986,6 +1986,7 @@ enum
     str_hudcolor,
     str_overlay,
     str_automap_preset,
+    str_automap_keyed_door,
 
     str_resolution_scale,
     str_midi_player,
@@ -3436,6 +3437,10 @@ static const char *automap_preset_strings[] = {
     "Vanilla", "Boom", "ZDoom"
 };
 
+static const char *automap_keyed_door_strings[] = {
+    "Off", "On", "Flashing"
+};
+
 setup_menu_t auto_settings1[] =  // 1st AutoMap Settings screen       
 {
   {"Modes", S_SKIP|S_TITLE, m_null, M_X, M_Y},
@@ -3453,7 +3458,8 @@ setup_menu_t auto_settings1[] =  // 1st AutoMap Settings screen
   {"Smooth automap lines", S_ONOFF, m_null, M_X, M_SPC,
    {"map_smooth_lines"}, 0, AM_EnableSmoothLines},
   {"Show Found Secrets Only", S_ONOFF, m_null, M_X, M_SPC, {"map_secret_after"}},
-  {"Flashing Keyed Doors" , S_ONOFF, m_null, M_X, M_SPC, {"map_keyed_door_flash"}},
+  {"Color Keyed Doors" , S_CHOICE, m_null, M_X, M_SPC,
+   {"map_keyed_door"}, 0, NULL, str_automap_keyed_door},
 
   MI_RESET,
 
@@ -6867,6 +6873,7 @@ static const char **selectstrings[] = {
     hudcolor_strings,
     overlay_strings,
     automap_preset_strings,
+    automap_keyed_door_strings,
     NULL, // str_resolution_scale
     NULL, // str_midi_player
     gamma_strings,
diff --git a/src/m_misc.c b/src/m_misc.c
index 134dcb99..f783df42 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -2412,10 +2412,10 @@ default_t defaults[] = {
   },
 
   {
-    "map_keyed_door_flash",
-    (config_t *) &map_keyed_door_flash, NULL,
-    {0}, {0,1}, number, ss_auto, wad_no,
-    "1 to make keyed doors flash on the automap"
+    "map_keyed_door",
+    (config_t *) &map_keyed_door, NULL,
+    {MAP_KEYED_DOOR_COLOR}, {MAP_KEYED_DOOR_OFF, MAP_KEYED_DOOR_FLASH}, number, ss_auto, wad_no,
+    "keyed doors are colored (1) or flashing (2) on the automap"
   },
 
   {