+#include "infomessages.qh"
+
+#include <common/ent_cs.qh>
+#include <common/mapinfo.qh>
+
// Info messages panel (#14)
#define drawInfoMessage(s) MACRO_BEGIN { \
string s;
if(!autocvar__hud_configure)
{
- if(spectatee_status && !intermission)
+ if(spectatee_status)
{
a = 1;
if(spectatee_status == -1)
{
entity sk;
sk = playerslots[player_localnum];
- if(sk.(scores[ps_primary]) >= 666)
+ if(sk.(scores(ps_primary)) >= 666)
s = _("^1Match has already begun");
- else if(sk.(scores[ps_primary]) > 0)
+ else if(sk.(scores(ps_primary)) > 0)
s = _("^1You have no more lives left");
else
s = sprintf(_("^1Press ^3%s^1 to join"), getcommandkey("jump", "+jump"));
drawInfoMessage(s);
}
- if(warmup_stage && !intermission)
+ if(warmup_stage)
{
s = _("^2Currently in ^1warmup^2 stage!");
drawInfoMessage(s);
else
blinkcolor = "^3";
- if(ready_waiting && !intermission && !spectatee_status)
+ if(ready_waiting && !spectatee_status)
{
if(ready_waiting_for_me)
{
}
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;