X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fchat.qc;h=5f309d0b0224bd4c019f9f4d51b29a9f851368a9;hb=0f689f166f8b173cfe456d3446ee877b9a80bf35;hp=02df4ed6290f1af6398b64e8b016cc699dd1b218;hpb=c741e6b3f012aa525f23e1df30d1d933b383fbc5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/chat.qc b/qcsrc/client/hud/panel/chat.qc
index 02df4ed62..5f309d0b0 100644
--- a/qcsrc/client/hud/panel/chat.qc
+++ b/qcsrc/client/hud/panel/chat.qc
@@ -1,4 +1,11 @@
-/** Handle chat as a panel (#12) */
+#include "chat.qh"
+
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
+
+// Chat (#12)
+
 void HUD_Chat()
 {
 	if(!autocvar__hud_configure)
@@ -20,7 +27,7 @@ void HUD_Chat()
 		}
 	}
 
-	HUD_Panel_UpdateCvars();
+	HUD_Panel_LoadCvars();
 
 	if(intermission == 2)
 	{
@@ -41,19 +48,19 @@ void HUD_Chat()
 			panel_bg = strcat(hud_skin_path, "/border_default");
 			if(precache_pic(panel_bg) == "")
 				panel_bg = "gfx/hud/default/border_default";
-			if(panel.current_panel_bg)
-				strunzone(panel.current_panel_bg);
-			panel.current_panel_bg = strzone(panel_bg);
+			strcpy(panel.current_panel_bg, panel_bg);
 			chat_panel_modified = true;
 		}
-		panel_bg_alpha = max(0.75, panel_bg_alpha); // force an theAlpha of at least 0.75
+		panel_bg_alpha = max(0.75, panel_bg_alpha);
 	}
 
 	vector pos, mySize;
 	pos = panel_pos;
 	mySize = panel_size;
 
-	HUD_Panel_DrawBg(1);
+	// chat messages don't scale properly since they are displayed directly by the engine
+	HUD_Scale_Disable();
+	HUD_Panel_DrawBg();
 
 	if(panel_bg_padding)
 	{
@@ -72,17 +79,13 @@ void HUD_Chat()
 
 	if(autocvar__hud_configure)
 	{
-		vector chatsize;
-		chatsize = '1 1 0' * autocvar_con_chatsize;
-		cvar_set("con_chatrect_x", "9001"); // over 9000, we'll fake it instead for more control over theAlpha and such
-		float i, a;
-		for(i = 0; i < autocvar_con_chat; ++i)
+		vector chatsize = '1 1 0' * autocvar_con_chatsize;
+		cvar_set("con_chatrect_x", "9001"); // over 9000, we'll fake it instead for more control over alpha and such
+		string str = textShortenToWidth(_("^3Player^7: This is the chat area."), mySize.x, chatsize, stringwidth_colors);
+		for(int i = 0; i < autocvar_con_chat; ++i)
 		{
-			if(i == autocvar_con_chat - 1)
-				a = panel_fg_alpha;
-			else
-				a = panel_fg_alpha * floor(((i + 1) * 7 + autocvar_con_chattime)/45);
-			drawcolorcodedstring(pos, textShortenToWidth(_("^3Player^7: This is the chat area."), mySize.x, chatsize, stringwidth_colors), chatsize, a, DRAWFLAG_NORMAL);
+			// engine displays chat text at full alpha
+			drawcolorcodedstring(pos, str, chatsize, 1, DRAWFLAG_NORMAL);
 			pos.y += chatsize.y;
 		}
 	}