Merge branch 'z411/info_cleanup' into 'master'

Cleanup obsolete warmup info messages

See merge request xonotic/xonotic-data.pk3dir!1088

diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc
index 0f0325eeba18bfd3b1a429422c7cbd41071120e2..9db3bf72e2c3b017c7f40c07047c647af4bb8455 100644 (file)
--- a/qcsrc/client/hud/panel/infomessages.qc
+++ b/qcsrc/client/hud/panel/infomessages.qc
@@ -162,19 +162,9 @@ void HUD_InfoMessages()
                else if(ready_waiting && !spectatee_status)
                {
                        if(ready_waiting_for_me)
-                       {
-                               if(warmup_stage)
-                                       s = sprintf(_("%sPress ^3%s%s to end warmup"), blinkcolor, getcommandkey(_("ready"), "ready"), blinkcolor);
-                               else
-                                       s = sprintf(_("%sPress ^3%s%s once you are ready"), blinkcolor, getcommandkey(_("ready"), "ready"), blinkcolor);
-                       }
+                               s = sprintf(_("%sPress ^3%s%s to end warmup"), blinkcolor, getcommandkey(_("ready"), "ready"), blinkcolor);
                        else
-                       {
-                               if(warmup_stage)
-                                       s = _("^2Waiting for others to ready up to end warmup...");
-                               else
-                                       s = _("^2Waiting for others to ready up...");
-                       }
+                               s = _("^2Waiting for others to ready up to end warmup...");
                        InfoMessage(s);
                }
                else if(warmup_stage && !spectatee_status)