X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Finfomessages.qc;h=131d62efe921129071db68a515723bf45cf0c69f;hb=6c319c2baf6bcac5d7f57d097b7773d1f6f23294;hp=a33e08084f9d9616e0681a1a719cd0b4a8e11c9b;hpb=3d632e50853d7bf6e499fc4400e5f4254ad54a1c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc
index a33e08084..131d62efe 100644
--- a/qcsrc/client/hud/panel/infomessages.qc
+++ b/qcsrc/client/hud/panel/infomessages.qc
@@ -1,6 +1,8 @@
 #include "infomessages.qh"
 
-#include "scoreboard.qh"
+#include <client/autocvars.qh>
+#include <client/miscfunctions.qh>
+
 #include <common/ent_cs.qh>
 #include <common/mapinfo.qh>
 
@@ -31,7 +33,6 @@ int img_select(int group_id)
 	return img_cur_msg[group_id];
 }
 
-float stringwidth_colors(string s, vector theSize);
 vector InfoMessages_drawstring(string s, vector pos, vector sz, float a, vector fontsize)
 {
 	getWrappedLine_remaining = s;
@@ -49,10 +50,10 @@ vector InfoMessages_drawstring(string s, vector pos, vector sz, float a, vector
 	return pos;
 }
 
-#define InfoMessage(s) MACRO_BEGIN { \
+#define InfoMessage(s) MACRO_BEGIN \
 	pos = InfoMessages_drawstring(s, pos, mySize, ((img_curr_group >= 0) ? panel_fg_alpha * img_fade[img_curr_group] : panel_fg_alpha), fontsize); \
 	img_curr_group = -1; \
-} MACRO_END
+MACRO_END
 
 void HUD_InfoMessages()
 {
@@ -61,9 +62,7 @@ void HUD_InfoMessages()
 		if(!autocvar_hud_panel_infomessages) return;
 	}
 
-	if(1 - scoreboard_fade_alpha <= 0)
-		return;
-	HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+	HUD_Panel_LoadCvars();
 	vector pos, mySize;
 	pos = panel_pos;
 	mySize = panel_size;
@@ -117,7 +116,9 @@ void HUD_InfoMessages()
 				InfoMessage(s);
 			}
 
-			if(gametype == MAPINFO_TYPE_LMS)
+			MUTATOR_CALLHOOK(DrawInfoMessages, pos, mySize);
+
+			if(!warmup_stage && ISGAMETYPE(LMS))
 			{
 				entity sk;
 				sk = playerslots[player_localnum];
@@ -177,7 +178,7 @@ void HUD_InfoMessages()
 			InfoMessage(s);
 		}
 
-		if(teamplay && !spectatee_status && gametype != MAPINFO_TYPE_CA && teamnagger)
+		if(teamplay && !spectatee_status && teamnagger)
 		{
 			float ts_min = 0, ts_max = 0;
 			entity tm = teams.sort_next;