X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fcenterprint.qc;h=f8f70c8189e671de3cb01fd3d4c4a8aab3e7745a;hb=cd4f4226492c148756d24b0bb46fdd8d23d41234;hp=7e7d1ab9a62a45cb2eb43136be42a41fa69d4217;hpb=3d632e50853d7bf6e499fc4400e5f4254ad54a1c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc
index 7e7d1ab9a..f8f70c818 100644
--- a/qcsrc/client/hud/panel/centerprint.qc
+++ b/qcsrc/client/hud/panel/centerprint.qc
@@ -1,6 +1,9 @@
 #include "centerprint.qh"
 
 #include "scoreboard.qh"
+#include <common/notifications/all.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 
 // CenterPrint (#16)
 
@@ -72,9 +75,7 @@ void centerprint_generic(int new_id, string strMessage, float duration, int coun
 			cpm_index = CENTERPRINT_MAX_MSGS - 1;
 		j = cpm_index;
 	}
-	if(centerprint_messages[j])
-		strunzone(centerprint_messages[j]);
-	centerprint_messages[j] = strzone(strMessage);
+	strcpy(centerprint_messages[j], strMessage);
 	centerprint_msgID[j] = new_id;
 	if (duration < 0)
 	{
@@ -109,9 +110,7 @@ void reset_centerprint_messages()
 		centerprint_expire_time[i] = 0;
 		centerprint_time[i] = 1;
 		centerprint_msgID[i] = 0;
-		if(centerprint_messages[i])
-			strunzone(centerprint_messages[i]);
-		centerprint_messages[i] = string_null;
+		strfree(centerprint_messages[i]);
 	}
 }
 float hud_configure_cp_generation_time;
@@ -153,24 +152,23 @@ void HUD_CenterPrint ()
 		}
 	}
 
-	// this panel fades only when the menu does
-	HUD_Panel_LoadCvars(1); // keep with the scoreboard
+	HUD_Panel_LoadCvars();
 
 	if ( HUD_Radar_Clickable() )
 	{
 		if (hud_panel_radar_bottom >= 0.96 * vid_conheight)
 			return;
 
-		panel_pos = eY * hud_panel_radar_bottom + eX * 0.5 * (vid_conwidth - panel_size_x);
-		panel_size_y = min(panel_size_y, vid_conheight - hud_panel_radar_bottom);
+		panel_pos.x = 0.5 * (vid_conwidth - panel_size.x);
+		panel_pos.y = hud_panel_radar_bottom;
+		panel_size.y = min(panel_size.y, vid_conheight - hud_panel_radar_bottom);
 	}
 	else if(!autocvar__hud_configure && scoreboard_fade_alpha)
 	{
 		// move the panel below the scoreboard
 		if (scoreboard_bottom >= 0.96 * vid_conheight)
 			return;
-		vector target_pos;
-		target_pos = eY * scoreboard_bottom + eX * 0.5 * (vid_conwidth - panel_size.x);
+		vector target_pos = vec2(0.5 * (vid_conwidth - panel_size.x), scoreboard_bottom);
 		if(target_pos.y > panel_pos.y)
 		{
 			panel_pos = panel_pos + (target_pos - panel_pos) * sqrt(scoreboard_fade_alpha);
@@ -247,6 +245,9 @@ void HUD_CenterPrint ()
 		else // Expiring soon, so fade it out.
 			a = (centerprint_expire_time[j] - time) / max(0.0001, autocvar_hud_panel_centerprint_fade_out);
 
+		if(centerprint_msgID[j] == CPID_TIMEIN)
+			a = 1;
+
 		// while counting down show it anyway in order to hold the current message position
 		if (a <= 0.5/255.0 && centerprint_countdown_num[j] == 0)  // Guaranteed invisible - don't show.
 			continue;