X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fchat.qc;h=972848260dcc94ab74d4c5fafa735517782d2625;hb=b315da9882695b2add6461b55ffa3621161c717d;hp=74d4b6d0f49462f522298e276770244dc54e278a;hpb=ea21cf9661f922f64dd6cc698f3aa717bb70c3ab;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/chat.qc b/qcsrc/client/hud/panel/chat.qc
index 74d4b6d0f..972848260 100644
--- a/qcsrc/client/hud/panel/chat.qc
+++ b/qcsrc/client/hud/panel/chat.qc
@@ -1,11 +1,14 @@
 #include "chat.qh"
 
-#include <client/autocvars.qh>
-#include <client/defs.qh>
-#include <client/miscfunctions.qh>
+#include <client/draw.qh>
 
 // Chat (#12)
 
+void HUD_Chat_Export(int fh)
+{
+	// allow saving cvars that aesthetically change the panel into hud skin files
+}
+
 void HUD_Chat()
 {
 	if(!autocvar__hud_configure)
@@ -48,9 +51,7 @@ 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);
@@ -73,11 +74,19 @@ void HUD_Chat()
 	if (!autocvar_con_chatrect)
 		cvar_set("con_chatrect", "1");
 
-	cvar_set("con_chatrect_x", ftos(pos.x/vid_conwidth));
-	cvar_set("con_chatrect_y", ftos(pos.y/vid_conheight));
-
-	cvar_set("con_chatwidth", ftos(mySize.x/vid_conwidth));
-	cvar_set("con_chat", ftos(floor(mySize.y/autocvar_con_chatsize - 0.5)));
+	// can't use a name ending with _x, _y and _z for a float autocvar as for autocvar specs
+	// it prevents ambiguity with component names of vector autocvars
+	if (cvar_string("con_chatrect_x") != ftos(pos.x / vid_conwidth))
+		cvar_set("con_chatrect_x", ftos(pos.x / vid_conwidth));
+	if (cvar_string("con_chatrect_y") != ftos(pos.y / vid_conheight))
+		cvar_set("con_chatrect_y", ftos(pos.y / vid_conheight));
+	// can't use direct comparison here, it would always returns true even if
+	// both arguments are equal because con_chatwidth is saved with cvar_set
+	//if (autocvar_con_chatwidth != mySize.x / vid_conwidth)
+	if (fabs(autocvar_con_chatwidth - mySize.x / vid_conwidth) > 0.00001)
+		cvar_set("con_chatwidth", ftos(mySize.x / vid_conwidth));
+	if (autocvar_con_chat != floor(mySize.y / autocvar_con_chatsize - 0.5))
+		cvar_set("con_chat", ftos(floor(mySize.y / autocvar_con_chatsize - 0.5)));
 
 	if(autocvar__hud_configure)
 	{