From b347ca9abada57606845c7843f0ba40a592ba61d Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Sat, 10 Jun 2023 08:45:02 +0200
Subject: [PATCH] prefer IDDT cheat key over IDBEHOLDA (#1096)

* prefer IDDT cheat key over IDBEHOLDA

* improve description
---
 src/m_cheat.c | 1 -
 src/m_input.h | 1 -
 src/m_menu.c  | 2 +-
 src/m_misc.c  | 8 --------
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/m_cheat.c b/src/m_cheat.c
index c3de07ab..e021b793 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -1267,7 +1267,6 @@ static const struct {
   { input_idbeholds, not_net|not_demo, {cheat_pw},       pw_strength },
   { input_idbeholdi, not_net|not_demo, {cheat_pw},       pw_invisibility },
   { input_idbeholdr, not_net|not_demo, {cheat_pw},       pw_ironfeet },
-  { input_idbeholda, not_dm,           {cheat_pw},       pw_allmap },
   { input_idbeholdl, not_dm,           {cheat_pw},       pw_infrared },
   { input_idrate,    always,           {cheat_rate},     0 },
   { input_iddt,      not_dm,           {cheat_ddt},      0 },
diff --git a/src/m_input.h b/src/m_input.h
index b7ec42e8..e0f2312a 100644
--- a/src/m_input.h
+++ b/src/m_input.h
@@ -125,7 +125,6 @@ enum
   input_idbeholds,
   input_idbeholdi,
   input_idbeholdr,
-  input_idbeholda,
   input_idbeholdl,
   input_idrate,
   input_iddt,
diff --git a/src/m_menu.c b/src/m_menu.c
index cfd05271..f6c9e0c0 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -3023,13 +3023,13 @@ setup_menu_t keys_settings7[] =
   {"Ammo & Keys"       ,S_INPUT ,m_scrn ,CHEAT_X,M_Y+ 3*M_SPC,{0},input_idkfa},
   {"Ammo"              ,S_INPUT ,m_scrn ,CHEAT_X,M_Y+ 4*M_SPC,{0},input_idfa},
   {"No Clipping"       ,S_INPUT ,m_scrn ,CHEAT_X,M_Y+ 5*M_SPC,{0},input_idclip},
+  {"Reveal Map"        ,S_INPUT ,m_scrn ,CHEAT_X,M_Y+12*M_SPC,{0},input_iddt},
   {"Health"            ,S_INPUT ,m_scrn ,CHEAT_X,M_Y+ 6*M_SPC,{0},input_idbeholdh},
   {"Armor"             ,S_INPUT ,m_scrn ,CHEAT_X,M_Y+ 7*M_SPC,{0},input_idbeholdm},
   {"Invulnerability"   ,S_INPUT ,m_scrn ,CHEAT_X,M_Y+ 8*M_SPC,{0},input_idbeholdv},
   {"Berserk"           ,S_INPUT ,m_scrn ,CHEAT_X,M_Y+ 9*M_SPC,{0},input_idbeholds},
   {"Partial Invisibility",S_INPUT,m_scrn,CHEAT_X,M_Y+10*M_SPC,{0},input_idbeholdi},
   {"Radiation Suit"    ,S_INPUT ,m_scrn ,CHEAT_X,M_Y+11*M_SPC,{0},input_idbeholdr},
-  {"Computer Area Map" ,S_INPUT ,m_scrn ,CHEAT_X,M_Y+12*M_SPC,{0},input_idbeholda},
   {"Light Amplification",S_INPUT,m_scrn ,CHEAT_X,M_Y+13*M_SPC,{0},input_idbeholdl},
   {"No Target"         ,S_INPUT ,m_scrn ,CHEAT_X,M_Y+14*M_SPC,{0},input_notarget},
   {"Freeze"            ,S_INPUT ,m_scrn ,CHEAT_X,M_Y+15*M_SPC,{0},input_freeze},
diff --git a/src/m_misc.c b/src/m_misc.c
index d8d4cdaf..ad2a25bc 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1681,14 +1681,6 @@ default_t defaults[] = {
     input_idbeholdr, { {0, 0} }
   },
 
-  {
-    "input_idbeholda",
-    NULL, NULL,
-    {0}, {UL,UL}, input, ss_keys, wad_no,
-    "key to give computer area map",
-    input_idbeholda, { {0, 0} }
-  },
-
   {
     "input_idbeholdl",
     NULL, NULL,