No player messages when no HUD

bradharding · Sep 28, 2024 · 8eeb7c7 · 8eeb7c7
1 parent 2478c15
commit 8eeb7c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
@@ -1621,7 +1621,8 @@ void HU_Ticker(void)
     }
 
     // display message if necessary
-    else if (viewplayer->message && (!message_nottobefuckedwith || message_dontfuckwithme))
+    else if (viewplayer->message && (!message_nottobefuckedwith || message_dontfuckwithme)
+        && (r_hud || r_screensize < r_screensize_max))
     {
         if (messages || message_dontfuckwithme || message_secret || message_warning)
         {

diff --git a/src/m_menu.c b/src/m_menu.c
@@ -2466,6 +2466,7 @@ static void M_SizeDisplay(int choice)
         {
             r_hud = false;
             C_StringCVAROutput(stringize(r_hud), "off");
+            message_counter = MIN(message_counter, 4);
             S_StartSound(NULL, sfx_stnmov);
             M_SaveCVARs();
         }
@@ -3424,8 +3425,9 @@ bool M_Responder(event_t *ev)
         return true;
     }
 
-    if (key == KEY_ENTER && *prevmessage && viewplayer->health > 0 && !consoleactive && !helpscreen
-        && messages && !keydown2 && !IsControlBound(keyboardcontrol, KEY_ENTER))
+    if (key == KEY_ENTER && *prevmessage && viewplayer->health > 0 && !consoleactive
+        && !helpscreen && messages && (r_hud || r_screensize < r_screensize_max)
+        && !keydown2 && !IsControlBound(keyboardcontrol, KEY_ENTER))
     {
         keydown2 = key;