From: Samual <samual@xonotic.org>
Date: Mon, 24 Oct 2011 20:27:28 +0000 (-0400)
Subject: Don't print messages which START outside of the panel (this way messages larger than... 
X-Git-Tag: xonotic-v0.6.0~35^2~78^2~7^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9ac78cecd2c1b72edc994dcc4dbed921040383c1;p=xonotic%2Fxonotic-data.pk3dir.git

Don't print messages which START outside of the panel (this way messages larger than the panel still are shown, but ones which were outside of the bounds in the first place are never shown)
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 979cf5c93..b4f24b1c5 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4711,12 +4711,6 @@ void HUD_CenterPrint (void)
 						pos_y -= fontsize_y;
 					else
 						pos_y -= fontsize_y * CENTERPRINT_SPACING/2;
-					// NOTE: uncommented so as to not reject messages whenever they are "too large" -- This just continues drawing it anyway.
-					//if (pos_y < panel_pos_y) // check if the next line can be shown
-					//{
-					//	drawfontscale = '1 1 0';
-					//	return;
-					//}
 				}
 			}
 			current_msg_pos_y = pos_y; // save starting pos (first line) of the current message
@@ -4738,12 +4732,6 @@ void HUD_CenterPrint (void)
 				}
 				else
 					pos_y += fontsize_y * CENTERPRINT_SPACING/2;
-				// NOTE: uncommented so as to not reject messages whenever they are "too large" -- This just continues drawing it anyway.
-				//if (!autocvar_hud_panel_centerprint_flip && pos_y > panel_pos_y + panel_size_y - fontsize_y) // check if the next line can be shown
-				//{
-				//	drawfontscale = '1 1 0';
-				//	return;
-				//}
 			}
 		}
 		msg_size = pos_y - msg_size;
@@ -4752,12 +4740,24 @@ void HUD_CenterPrint (void)
 			pos_y = current_msg_pos_y - CENTERPRINT_SPACING * fontsize_y;
 			if (a < 1 && centerprint_msgID[j] == 0) // messages with id can be replaced just after they are faded out, so never move over them the next messages
 				pos_y += (msg_size + CENTERPRINT_SPACING * fontsize_y) * (1 - sqrt(sz));
+				
+			if (pos_y < panel_pos_y) // check if the next line can be shown
+			{
+				drawfontscale = '1 1 0';
+				return;
+			}
 		}
 		else
 		{
 			pos_y += CENTERPRINT_SPACING * fontsize_y;
 			if (a < 1 && centerprint_msgID[j] == 0) // messages with id can be replaced just after they are faded out, so never move over them the next messages
 				pos_y -= (msg_size + CENTERPRINT_SPACING * fontsize_y) * (1 - sqrt(sz));
+				
+			if(pos_y > panel_pos_y + panel_size_y - fontsize_y) // check if the next line can be shown
+			{
+				drawfontscale = '1 1 0';
+				return;
+			}
 		}
 	}
 	drawfontscale = '1 1 0';