Revert allowing alt hud selection with +/- keys

bradharding · Nov 14, 2024 · d041a18 · d041a18
1 parent daa2cc2
commit d041a18
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 31 deletions.
diff --git a/releasenotes.md b/releasenotes.md
@@ -41,7 +41,6 @@
 * The [fake contrast](https://doomwiki.org/wiki/Fake_contrast) applied to walls at different angles is now more varied.
 * A bug is fixed whereby the player’s aim was slightly lower when the `freelook` CVAR was `on` and the `r_screensize` CVAR was `8`.
 * These changes have been made to the alternate widescreen HUD:
-  * The HUD can now be easily accessed along with the default widescreen HUD by pressing the <kbd><b>+</b></kbd> and <kbd><b>&ndash;</b></kbd> keys during a game.
   * The weapon silhouette now accurately reflects the pickup sprite for each weapon.
   * Certain elements have now either shifted position, increased in size and/or cast a slight shadow.
   * The health bar no longer flashes white while it is red and the player picks up some health.

diff --git a/src/m_menu.c b/src/m_menu.c
@@ -2066,12 +2066,12 @@ static void M_DrawOptions(void)
     }
 
     dot = (float)(r_screensize + (r_screensize < r_screensize_max - 1 ? 0 :
-        (r_screensize == r_screensize_max - 1 ? vid_widescreen : 1 + (int)r_althud + (int)(!r_hud))));
+        (r_screensize == r_screensize_max - 1 ? vid_widescreen : 1 + !r_hud)));
     OptionsMenu[option_empty1].sliderx = MAXWIDESCREENDELTA
-        + OptionsDef.x - 1 + 8 + (int)(dot * 5.9f) + 2;
+        + OptionsDef.x - 1 + 8 + (int)(dot * 6.54f) + 2;
     OptionsMenu[option_empty1].width = 16 * 8 + 12;
     M_DrawSlider(OptionsDef.x - 1, OptionsDef.y + 16 * (scrnsize + 1) + OFFSET + !hacx,
-        9, 15, dot, 5.9f, 8, (itemon == scrnsize || itemon == option_empty1));
+        9, 15, dot, 6.54f, 8, (itemon == scrnsize || itemon == option_empty1));
 
     if (usingcontroller && (!M_MSENS || DBIGFONT))
     {
@@ -2419,13 +2419,6 @@ static void M_SizeDisplay(int choice)
             S_StartSound(NULL, sfx_stnmov);
             M_SaveCVARs();
         }
-        else if (r_screensize == r_screensize_max && r_althud)
-        {
-            r_althud = false;
-            C_StringCVAROutput(stringize(r_althud), "off");
-            S_StartSound(NULL, sfx_stnmov);
-            M_SaveCVARs();
-        }
         else if (r_screensize == r_screensize_max - 1 && vid_widescreen)
         {
             vid_widescreen = false;
@@ -2454,14 +2447,7 @@ static void M_SizeDisplay(int choice)
     }
     else
     {
-        if (r_screensize == r_screensize_max && r_hud && !r_althud)
-        {
-            r_althud = true;
-            C_StringCVAROutput(stringize(r_althud), "on");
-            S_StartSound(NULL, sfx_stnmov);
-            M_SaveCVARs();
-        }
-        else if (r_screensize == r_screensize_max && r_hud && r_althud)
+        if (r_screensize == r_screensize_max && r_hud)
         {
             r_hud = false;
             C_StringCVAROutput(stringize(r_hud), "off");
@@ -2487,12 +2473,6 @@ static void M_SizeDisplay(int choice)
             {
                 r_hud = true;
                 C_StringCVAROutput(stringize(r_hud), "on");
-
-                if (r_althud)
-                {
-                    r_althud = false;
-                    C_StringCVAROutput(stringize(r_althud), "off");
-                }
             }
 
             S_StartSound(NULL, sfx_stnmov);
@@ -3469,12 +3449,6 @@ bool M_Responder(event_t *ev)
                     r_hud = false;
                     C_StringCVAROutput(stringize(r_hud), "off");
                 }
-
-                if (r_althud)
-                {
-                    r_althud = false;
-                    C_StringCVAROutput(stringize(r_althud), "off");
-                }
             }
 
             R_SetViewSize(menuactive && viewactive ? r_screensize_max : r_screensize_default);