From: terencehill Date: Sat, 30 Jan 2016 10:29:20 +0000 (+0100) Subject: Remove pointless checks for intermission in the infomessages panel, this panel is... X-Git-Tag: xonotic-v0.8.2~1208^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F276%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Remove pointless checks for intermission in the infomessages panel, this panel is not drawn during the intermission --- diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc index 4e32fa662..74b962410 100644 --- a/qcsrc/client/hud/panel/infomessages.qc +++ b/qcsrc/client/hud/panel/infomessages.qc @@ -56,7 +56,7 @@ void HUD_InfoMessages() string s; if(!autocvar__hud_configure) { - if(spectatee_status && !intermission) + if(spectatee_status) { a = 1; if(spectatee_status == -1) @@ -104,7 +104,7 @@ void HUD_InfoMessages() drawInfoMessage(s); } - if(warmup_stage && !intermission) + if(warmup_stage) { s = _("^2Currently in ^1warmup^2 stage!"); drawInfoMessage(s); @@ -116,7 +116,7 @@ void HUD_InfoMessages() else blinkcolor = "^3"; - if(ready_waiting && !intermission && !spectatee_status) + if(ready_waiting && !spectatee_status) { if(ready_waiting_for_me) { @@ -134,13 +134,13 @@ void HUD_InfoMessages() } drawInfoMessage(s); } - else if(warmup_stage && !intermission && !spectatee_status) + else if(warmup_stage && !spectatee_status) { s = sprintf(_("^2Press ^3%s^2 to end warmup"), getcommandkey("ready", "ready")); drawInfoMessage(s); } - if(teamplay && !intermission && !spectatee_status && gametype != MAPINFO_TYPE_CA && teamnagger) + if(teamplay && !spectatee_status && gametype != MAPINFO_TYPE_CA && teamnagger) { float ts_min = 0, ts_max = 0; tm = teams.sort_next;