From: terencehill <piuntn@gmail.com>
Date: Mon, 2 Mar 2015 14:34:35 +0000 (+0100)
Subject: Simpler and less spammy centerprint panel when it isn't selected
X-Git-Tag: xonotic-v0.8.1~58^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bed0f601ca225c889b4b3b379613e0c879d37c27;p=xonotic%2Fxonotic-data.pk3dir.git

Simpler and less spammy centerprint panel when it isn't selected
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 105cce5f2..8766b349b 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4213,15 +4213,23 @@ void HUD_CenterPrint (void)
 			reset_centerprint_messages();
 		if (time > hud_configure_cp_generation_time)
 		{
-			float r;
-			r = random();
-			if (r > 0.75)
-				centerprint_generic(floor(r*1000), strcat(sprintf("^3Countdown message at time %s", seconds_tostring(time)), ", seconds left: ^COUNT"), 1, 10);
-			else if (r > 0.5)
-				centerprint_generic(0, sprintf("^1Multiline message at time %s that\n^1lasts longer than normal", seconds_tostring(time)), 20, 0);
+			if(HUD_PANEL(CENTERPRINT) == highlightedPanel)
+			{
+				float r;
+				r = random();
+				if (r > 0.8)
+					centerprint_generic(floor(r*1000), strcat(sprintf("^3Countdown message at time %s", seconds_tostring(time)), ", seconds left: ^COUNT"), 1, 10);
+				else if (r > 0.55)
+					centerprint_generic(0, sprintf("^1Multiline message at time %s that\n^1lasts longer than normal", seconds_tostring(time)), 20, 0);
+				else
+					centerprint_hud(sprintf("Message at time %s", seconds_tostring(time)));
+				hud_configure_cp_generation_time = time + 1 + random()*4;
+			}
 			else
-				centerprint_hud(sprintf("Message at time %s", seconds_tostring(time)));
-			hud_configure_cp_generation_time = time + 1 + random()*4;
+			{
+				centerprint_generic(0, sprintf("Centerprint message", seconds_tostring(time)), 10, 0);
+				hud_configure_cp_generation_time = time + 10 - random()*3;
+			}
 		}
 	}