X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Finfomessages.qc;h=131d62efe921129071db68a515723bf45cf0c69f;hp=2d6c952fc0f3764cfced6e99448be1a14628dd47;hb=93afc08b09294e6dea4d0c98ce5226fdee9d1c92;hpb=34e7f534e2015466228eb3a78c9857741b736dca

diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc
index 2d6c952fc..131d62efe 100644
--- a/qcsrc/client/hud/panel/infomessages.qc
+++ b/qcsrc/client/hud/panel/infomessages.qc
@@ -1,5 +1,8 @@
 #include "infomessages.qh"
 
+#include <client/autocvars.qh>
+#include <client/miscfunctions.qh>
+
 #include <common/ent_cs.qh>
 #include <common/mapinfo.qh>
 
@@ -30,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;
@@ -48,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()
 {
@@ -116,7 +118,7 @@ void HUD_InfoMessages()
 
 			MUTATOR_CALLHOOK(DrawInfoMessages, pos, mySize);
 
-			if(!warmup_stage && gametype == MAPINFO_TYPE_LMS)
+			if(!warmup_stage && ISGAMETYPE(LMS))
 			{
 				entity sk;
 				sk = playerslots[player_localnum];
@@ -176,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;