cvar_t sbar_alpha_bg = {CVAR_SAVE, "sbar_alpha_bg", "0.4", "opacity value of the statusbar background image"};
cvar_t sbar_alpha_fg = {CVAR_SAVE, "sbar_alpha_fg", "1", "opacity value of the statusbar weapon/item icons and numbers"};
cvar_t sbar_hudselector = {CVAR_SAVE, "sbar_hudselector", "0", "selects which of the builtin hud layouts to use (meaning is somewhat dependent on gamemode, so nexuiz has a very different set of hud layouts than quake for example)"};
+cvar_t sbar_miniscoreboard_size = {CVAR_SAVE, "sbar_miniscoreboard_size", "-1", "sets the size of the mini deathmatch overlay in items, or disables it when set to 0, or sets it to a sane default when set to -1"};
+cvar_t sbar_flagstatus_right = {CVAR_SAVE, "sbar_flagstatus_right", "0", "moves Nexuiz flag status icons to the right"};
cvar_t cl_deathscoreboard = {0, "cl_deathscoreboard", "1", "shows scoreboard (+showscores) while dead"};
void Sbar_IntermissionOverlay (void);
void Sbar_FinaleOverlay (void);
+void CL_VM_UpdateShowingScoresState (int showingscores);
+
/*
===============
if (sb_showscores)
return;
sb_showscores = true;
+ CL_VM_UpdateShowingScoresState(sb_showscores);
}
/*
void Sbar_DontShowScores (void)
{
sb_showscores = false;
+ CL_VM_UpdateShowingScoresState(sb_showscores);
}
void sbar_start(void)
{
int i;
- if (gamemode == GAME_NETHERWORLD)
+ if (gamemode == GAME_DELUXEQUAKE)
{
}
else if (gamemode == GAME_SOM)
for (i = 0;i < 10;i++)
sb_nums[0][i] = Draw_CachePic (va("gfx/num_%i",i), true);
sb_nums[0][10] = Draw_CachePic ("gfx/num_minus", true);
+ sb_colon = Draw_CachePic ("gfx/num_colon", true);
sb_ammo[0] = Draw_CachePic ("gfx/sb_shells", true);
sb_ammo[1] = Draw_CachePic ("gfx/sb_bullets", true);
Cvar_RegisterVariable(&sbar_alpha_bg);
Cvar_RegisterVariable(&sbar_alpha_fg);
Cvar_RegisterVariable(&sbar_hudselector);
+ Cvar_RegisterVariable(&sbar_miniscoreboard_size);
Cvar_RegisterVariable(&cl_deathscoreboard);
Cvar_RegisterVariable(&crosshair_color_red);
Cvar_RegisterVariable(&crosshair_color_alpha);
Cvar_RegisterVariable(&crosshair_size);
+ if(gamemode == GAME_NEXUIZ)
+ Cvar_RegisterVariable(&sbar_flagstatus_right); // this cvar makes no sense in other games
+
R_RegisterModule("sbar", sbar_start, sbar_shutdown, sbar_newmap);
}
char str[32], *ptr;
int l, frame;
- l = sprintf(str, "%i", num);
+ if (digits < 0)
+ {
+ digits = -digits;
+ l = sprintf(str, "%0*i", digits, num);
+ }
+ else
+ l = sprintf(str, "%i", num);
ptr = str;
if (l > digits)
ptr += (l-digits);
// ammo counts
for (i=0 ; i<4 ; i++)
{
- sprintf (num, "%3i",cl.stats[STAT_SHELLS+i] );
+ sprintf (num, "%4i",cl.stats[STAT_SHELLS+i] );
if (num[0] != ' ')
- Sbar_DrawCharacter ( (6*i+1)*8 - 2, -24, 18 + num[0] - '0');
+ Sbar_DrawCharacter ( (6*i+0)*8 - 2, -24, 18 + num[0] - '0');
if (num[1] != ' ')
- Sbar_DrawCharacter ( (6*i+2)*8 - 2, -24, 18 + num[1] - '0');
+ Sbar_DrawCharacter ( (6*i+1)*8 - 2, -24, 18 + num[1] - '0');
if (num[2] != ' ')
- Sbar_DrawCharacter ( (6*i+3)*8 - 2, -24, 18 + num[2] - '0');
+ Sbar_DrawCharacter ( (6*i+2)*8 - 2, -24, 18 + num[2] - '0');
+ if (num[3] != ' ')
+ Sbar_DrawCharacter ( (6*i+3)*8 - 2, -24, 18 + num[3] - '0');
}
// items
s = &cl.scores[k];
// draw background
- c = (unsigned char *)&palette_complete[(s->colors & 0xf0) + 8];
+ c = palette_rgb_pantsscoreboard[(s->colors & 0xf0) >> 4];
DrawQ_Fill (sbar_x + x + 10, sbar_y - 23, 28, 4, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0);
- c = (unsigned char *)&palette_complete[((s->colors & 15)<<4) + 8];
+ c = palette_rgb_shirtscoreboard[s->colors & 0xf];
DrawQ_Fill (sbar_x + x + 10, sbar_y + 4 - 23, 28, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0);
// draw number
s = &cl.scores[cl.viewentity - 1];
// draw background
Sbar_DrawPic (112, 0, rsb_teambord);
- c = (unsigned char *)&palette_complete[(s->colors & 0xf0) + 8];
+ c = palette_rgb_pantsscoreboard[(s->colors & 0xf0) >> 4];
DrawQ_Fill (sbar_x + 113, vid_conheight.integer-SBAR_HEIGHT+3, 22, 9, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0);
- c = (unsigned char *)&palette_complete[((s->colors & 15)<<4) + 8];
+ c = palette_rgb_shirtscoreboard[s->colors & 0xf];
DrawQ_Fill (sbar_x + 113, vid_conheight.integer-SBAR_HEIGHT+12, 22, 9, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0);
// draw number
*/
extern float v_dmg_time, v_dmg_roll, v_dmg_pitch;
extern cvar_t v_kicktime;
+void Sbar_Score (int margin);
void Sbar_Draw (void)
{
cachepic_t *pic;
}
else if (cl.intermission == 2)
Sbar_FinaleOverlay();
- else if (gamemode == GAME_NETHERWORLD)
+ else if (gamemode == GAME_DELUXEQUAKE)
{
}
else if (gamemode == GAME_SOM)
int i;
float fade;
int redflag, blueflag;
+ float x;
sbar_x = (vid_conwidth.integer - 320)/2;
sbar_y = vid_conheight.integer - 24 - 16;
// flag icons
redflag = ((cl.stats[STAT_ITEMS]>>15) & 3);
blueflag = ((cl.stats[STAT_ITEMS]>>17) & 3);
+ x = sbar_flagstatus_right.integer ? vid_conwidth.integer - 10 - sbar_x - 64 : 10 - sbar_x;
if (redflag == 3 && blueflag == 3)
{
// The Impossible Combination[tm]
// Can only happen in Key Hunt mode...
- Sbar_DrawPic (10 - sbar_x, -179, sb_items[14]);
+ Sbar_DrawPic (x, -179, sb_items[14]);
}
else
{
if (redflag)
- Sbar_DrawPic (10 - sbar_x, -109, sb_items[redflag+10]);
+ Sbar_DrawPic (x, -117, sb_items[redflag+10]);
if (blueflag)
- Sbar_DrawPic (10 - sbar_x, -169, sb_items[blueflag+14]);
+ Sbar_DrawPic (x, -177, sb_items[blueflag+14]);
}
// armor
if (cl.stats[STAT_ARMOR] > 0)
{
Sbar_DrawStretchPic (0, 0, sb_armor[0], sbar_alpha_fg.value, 24, 24);
- if(cl.stats[STAT_ARMOR] > 100)
- Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,1,1,0,1,0);
- else if(cl.stats[STAT_ARMOR] > 25)
+ if(cl.stats[STAT_ARMOR] > 200)
+ Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,0,1,0,1,0);
+ else if(cl.stats[STAT_ARMOR] > 100)
+ Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,0.2,1,0.2,1,0);
+ else if(cl.stats[STAT_ARMOR] > 50)
Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,0.6,0.7,0.8,1,0);
+ else if(cl.stats[STAT_ARMOR] > 25)
+ Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,1,1,0.2,1,0);
else
Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,0.7,0,0,1,0);
}
if (cl.stats[STAT_HEALTH] != 0)
{
Sbar_DrawStretchPic (112, 0, sb_health, sbar_alpha_fg.value, 24, 24);
- if(cl.stats[STAT_HEALTH] > 100)
- Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,1,1,0,1,0);
- else if(cl.stats[STAT_HEALTH] > 25)
+ if(cl.stats[STAT_HEALTH] > 200)
+ Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,0,1,0,1,0);
+ else if(cl.stats[STAT_HEALTH] > 100)
+ Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,0.2,1,0.2,1,0);
+ else if(cl.stats[STAT_HEALTH] > 50)
Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,0.6,0.7,0.8,1,0);
+ else if(cl.stats[STAT_HEALTH] > 25)
+ Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,1,1,0.2,1,0);
else
Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,0.7,0,0,1,0);
}
if (sbar_x + 320 + 160 <= vid_conwidth.integer)
Sbar_MiniDeathmatchOverlay (sbar_x + 320, sbar_y);
+ if (sbar_x > 0)
+ Sbar_Score(16);
+ // The margin can be at most 8 to support 640x480 console size:
+ // 320 + 2 * (144 + 16) = 640
}
else if (sb_lines)
{
int i;
float fade;
int redflag, blueflag;
+ float x;
sbar_x = (vid_conwidth.integer - 640)/2;
sbar_y = vid_conheight.integer - 47;
// flag icons
redflag = ((cl.stats[STAT_ITEMS]>>15) & 3);
blueflag = ((cl.stats[STAT_ITEMS]>>17) & 3);
+ x = sbar_flagstatus_right.integer ? vid_conwidth.integer - 10 - sbar_x - 64 : 10 - sbar_x;
if (redflag == 3 && blueflag == 3)
{
// The Impossible Combination[tm]
// Can only happen in Key Hunt mode...
- Sbar_DrawPic (10 - sbar_x, -179, sb_items[14]);
+ Sbar_DrawPic (x, -179, sb_items[14]);
}
else
{
if (redflag)
- Sbar_DrawPic (10 - sbar_x, -109, sb_items[redflag+10]);
+ Sbar_DrawPic (x, -117, sb_items[redflag+10]);
if (blueflag)
- Sbar_DrawPic (10 - sbar_x, -169, sb_items[blueflag+14]);
+ Sbar_DrawPic (x, -177, sb_items[blueflag+14]);
}
// armor
if (sbar_x + 600 + 160 <= vid_conwidth.integer)
Sbar_MiniDeathmatchOverlay (sbar_x + 600, sbar_y);
+
+ if (sbar_x > 0)
+ Sbar_Score(-16);
+ // Because:
+ // Mini scoreboard uses 12*4 per other team, that is, 144
+ // pixels when there are four teams...
+ // Nexuiz by default sets vid_conwidth to 800... makes
+ // sbar_x == 80...
+ // so we need to shift it by 64 pixels to the right to fit
+ // BUT: then it overlaps with the image that gets drawn
+ // for viewsize 100! Therefore, just account for 3 teams,
+ // that is, 96 pixels mini scoreboard size, needing 16 pixels
+ // to the right!
}
}
else if (gamemode == GAME_ZYMOTIC)
}
else // Quake and others
{
+ sbar_x = (vid_conwidth.integer - 320)/2;
sbar_y = vid_conheight.integer - SBAR_HEIGHT;
// LordHavoc: changed to draw the deathmatch overlays in any multiplayer mode
//if (cl.gametype == GAME_DEATHMATCH && gamemode != GAME_TRANSFUSION)
- if (!cl.islocalgame && gamemode != GAME_TRANSFUSION)
- sbar_x = 0;
- else
- sbar_x = (vid_conwidth.integer - 320)/2;
if (sb_lines > 24)
{
Sbar_DrawNum (248, 0, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10);
- }
-
- // LordHavoc: changed to draw the deathmatch overlays in any multiplayer mode
- //if (vid_conwidth.integer > 320 && cl.gametype == GAME_DEATHMATCH)
- if (!cl.islocalgame && vid_conwidth.integer > 320)
- {
- if (gamemode == GAME_TRANSFUSION)
- Sbar_MiniDeathmatchOverlay (0, 0);
- else
- Sbar_MiniDeathmatchOverlay (324, vid_conheight.integer - sb_lines);
+ // LordHavoc: changed to draw the deathmatch overlays in any multiplayer mode
+ if ((!cl.islocalgame || cl.gametype != GAME_COOP))
+ {
+ if (gamemode == GAME_TRANSFUSION)
+ Sbar_MiniDeathmatchOverlay (0, 0);
+ else
+ Sbar_MiniDeathmatchOverlay (sbar_x + 324, vid_conheight.integer - 8*8);
+ Sbar_Score(24);
+ }
}
}
}
else
{
// draw colors behind score
- c = (unsigned char *)&palette_complete[(s->colors & 0xf0) + 8];
+ //
+ //
+ //
+ //
+ //
+ c = palette_rgb_pantsscoreboard[(s->colors & 0xf0) >> 4];
DrawQ_Fill(x + 14*8, y+1, 40, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0);
- c = (unsigned char *)&palette_complete[((s->colors & 15)<<4) + 8];
+ c = palette_rgb_shirtscoreboard[s->colors & 0xf];
DrawQ_Fill(x + 14*8, y+4, 40, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0);
// print the text
//DrawQ_String(x, y, va("%c%4i %s", myself ? 13 : ' ', (int) s->frags, s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, true);
else
{
// draw colors behind score
- c = (unsigned char *)&palette_complete[(s->colors & 0xf0) + 8];
+ c = palette_rgb_pantsscoreboard[(s->colors & 0xf0) >> 4];
DrawQ_Fill(x + 9*8, y+1, 40, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0);
- c = (unsigned char *)&palette_complete[((s->colors & 15)<<4) + 8];
+ c = palette_rgb_shirtscoreboard[s->colors & 0xf];
DrawQ_Fill(x + 9*8, y+4, 40, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0);
// print the text
//DrawQ_String(x, y, va("%c%4i %s", myself ? 13 : ' ', (int) s->frags, s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, true);
MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
MSG_WriteString(&cls.netcon->message, "pings");
}
- else if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5 || cls.protocol == PROTOCOL_DARKPLACES6/* || cls.protocol == PROTOCOL_DARKPLACES7*/)
+ else if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5 || cls.protocol == PROTOCOL_DARKPLACES6/* || cls.protocol == PROTOCOL_DARKPLACES7*/)
{
// these servers usually lack the pings command and so a less efficient "ping" command must be sent, which on modern DP servers will also reply with a pingplreport command after the ping listing
static int ping_anyway_counter = 0;
/*
==================
-Sbar_DeathmatchOverlay
+Sbar_MiniDeathmatchOverlay
==================
*/
{
int i, j, numlines, range_begin, range_end, myteam, teamsep;
+ // do not draw this if sbar_miniscoreboard_size is zero
+ if(sbar_miniscoreboard_size.value == 0)
+ return;
+ // adjust the given y if sbar_miniscoreboard_size doesn't indicate default (< 0)
+ if(sbar_miniscoreboard_size.value > 0)
+ y = vid_conheight.integer - sbar_miniscoreboard_size.value * 8;
+
// scores
Sbar_SortFrags ();
}
else
{
- if (Sbar_IsTeammatch ())
- {
- // show team scores first
- for (j = 0;j < teamlines && y < vid_conheight.integer;j++)
- y += (int)Sbar_PrintScoreboardItem((teams + teamsort[j]), x, y);
- y += teamsep;
- }
+ if(range_end - i < numlines) // won't draw to bottom?
+ y += 8 * (numlines - (range_end - i)); // bottom align
+ // show team scores first
+ for (j = 0;j < teamlines && y < vid_conheight.integer;j++)
+ y += (int)Sbar_PrintScoreboardItem((teams + teamsort[j]), x, y);
+ y += teamsep;
for (;i < range_end && y < vid_conheight.integer;i++)
y += (int)Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y);
}
}
+int Sbar_TeamColorCompare(const void *t1_, const void *t2_)
+{
+ static int const sortorder[16] =
+ {
+ 1001,
+ 1002,
+ 1003,
+ 1004,
+ 1, // red
+ 1005,
+ 1006,
+ 1007,
+ 1008,
+ 4, // pink
+ 1009,
+ 1010,
+ 3, // yellow
+ 2, // blue
+ 1011,
+ 1012
+ };
+ const scoreboard_t *t1 = *(scoreboard_t **) t1_;
+ const scoreboard_t *t2 = *(scoreboard_t **) t2_;
+ int tc1 = sortorder[t1->colors & 15];
+ int tc2 = sortorder[t2->colors & 15];
+ return tc1 - tc2;
+}
+
+void Sbar_Score (int margin)
+{
+ int i, me, score, otherleader, place, distribution, minutes, seconds;
+ double timeleft;
+ int sbar_x_save = sbar_x;
+ int sbar_y_save = sbar_y;
+
+ sbar_y = vid_conheight.value - (32+12);
+ sbar_x -= margin;
+
+ me = cl.playerentity - 1;
+ if (me >= 0 && me < cl.maxclients)
+ {
+ if(Sbar_IsTeammatch())
+ {
+ // Layout:
+ //
+ // team1 team3 team4
+ //
+ // TEAM2
+
+ scoreboard_t *teamcolorsort[16];
+
+ Sbar_SortFrags();
+ for(i = 0; i < teamlines; ++i)
+ teamcolorsort[i] = &(teams[i]);
+
+ // Now sort them by color
+ qsort(teamcolorsort, teamlines, sizeof(*teamcolorsort), Sbar_TeamColorCompare);
+
+ // : margin
+ // -12*4: four digits space
+ place = (teamlines - 1) * (-12 * 4);
+
+ for(i = 0; i < teamlines; ++i)
+ {
+ int cindex = teamcolorsort[i]->colors & 15;
+ unsigned char *c = palette_rgb_shirtscoreboard[cindex];
+ float cm = max(max(c[0], c[1]), c[2]);
+ float cr = c[0] / cm;
+ float cg = c[1] / cm;
+ float cb = c[2] / cm;
+ if(cindex == (cl.scores[cl.playerentity - 1].colors & 15)) // my team
+ {
+ Sbar_DrawXNum(-32*4, 0, teamcolorsort[i]->frags, 4, 32, cr, cg, cb, 1, 0);
+ }
+ else // other team
+ {
+ Sbar_DrawXNum(place, -12, teamcolorsort[i]->frags, 4, 12, cr, cg, cb, 1, 0);
+ place += 4 * 12;
+ }
+ }
+ }
+ else
+ {
+ // Layout:
+ //
+ // leading place
+ //
+ // FRAGS
+ //
+ // find leading score other than ourselves, to calculate distribution
+ // find our place in the scoreboard
+ score = cl.scores[me].frags;
+ for (i = 0, otherleader = -1, place = 1;i < cl.maxclients;i++)
+ {
+ if (cl.scores[i].name[0] && i != me)
+ {
+ if (otherleader == -1 || cl.scores[i].frags > cl.scores[otherleader].frags)
+ otherleader = i;
+ if (score < cl.scores[i].frags || (score == cl.scores[i].frags && i < me))
+ place++;
+ }
+ }
+ distribution = otherleader >= 0 ? score - cl.scores[otherleader].frags : 0;
+ if (place == 1)
+ Sbar_DrawXNum(-3*12, -12, place, 3, 12, 1, 1, 1, 1, 0);
+ else if (place == 2)
+ Sbar_DrawXNum(-3*12, -12, place, 3, 12, 1, 1, 0, 1, 0);
+ else
+ Sbar_DrawXNum(-3*12, -12, place, 3, 12, 1, 0, 0, 1, 0);
+ if (otherleader < 0)
+ Sbar_DrawXNum(-32*4, 0, score, 4, 32, 1, 1, 1, 1, 0);
+ if (distribution >= 0)
+ {
+ Sbar_DrawXNum(-7*12, -12, distribution, 4, 12, 1, 1, 1, 1, 0);
+ Sbar_DrawXNum(-32*4, 0, score, 4, 32, 1, 1, 1, 1, 0);
+ }
+ else if (distribution >= -5)
+ {
+ Sbar_DrawXNum(-7*12, -12, distribution, 4, 12, 1, 1, 0, 1, 0);
+ Sbar_DrawXNum(-32*4, 0, score, 4, 32, 1, 1, 0, 1, 0);
+ }
+ else
+ {
+ Sbar_DrawXNum(-7*12, -12, distribution, 4, 12, 1, 0, 0, 1, 0);
+ Sbar_DrawXNum(-32*4, 0, score, 4, 32, 1, 0, 0, 1, 0);
+ }
+ }
+ }
+
+ if (cl.statsf[STAT_TIMELIMIT])
+ {
+ timeleft = max(0, cl.statsf[STAT_TIMELIMIT] * 60 - cl.time);
+ minutes = (int)floor(timeleft / 60);
+ seconds = (int)(floor(timeleft) - minutes * 60);
+ if (minutes >= 5)
+ {
+ Sbar_DrawXNum(-12*6, 32, minutes, 3, 12, 1, 1, 1, 1, 0);
+ if(sb_colon && sb_colon->tex != r_texture_notexture)
+ DrawQ_Pic(sbar_x + -12*3, sbar_y + 32, sb_colon, 12, 12, 1, 1, 1, sbar_alpha_fg.value, 0);
+ Sbar_DrawXNum(-12*2, 32, seconds, -2, 12, 1, 1, 1, 1, 0);
+ }
+ else if (minutes >= 1)
+ {
+ Sbar_DrawXNum(-12*6, 32, minutes, 3, 12, 1, 1, 0, 1, 0);
+ if(sb_colon && sb_colon->tex != r_texture_notexture)
+ DrawQ_Pic(sbar_x + -12*3, sbar_y + 32, sb_colon, 12, 12, 1, 1, 0, sbar_alpha_fg.value, 0);
+ Sbar_DrawXNum(-12*2, 32, seconds, -2, 12, 1, 1, 0, 1, 0);
+ }
+ else if ((int)(timeleft * 4) & 1)
+ Sbar_DrawXNum(-12*2, 32, seconds, -2, 12, 1, 1, 1, 1, 0);
+ else
+ Sbar_DrawXNum(-12*2, 32, seconds, -2, 12, 1, 0, 0, 1, 0);
+ }
+ else
+ {
+ minutes = (int)floor(cl.time / 60);
+ seconds = (int)(floor(cl.time) - minutes * 60);
+ Sbar_DrawXNum(-12*6, 32, minutes, 3, 12, 1, 1, 1, 1, 0);
+ if(sb_colon && sb_colon->tex != r_texture_notexture)
+ DrawQ_Pic(sbar_x + -12*3, sbar_y + 32, sb_colon, 12, 12, 1, 1, 1, sbar_alpha_fg.value, 0);
+ Sbar_DrawXNum(-12*2, 32, seconds, -2, 12, 1, 1, 1, 1, 0);
+ }
+
+ sbar_x = sbar_x_save;
+ sbar_y = sbar_y_save;
+}
+
/*
==================
Sbar_IntermissionOverlay
int dig;
int num;
- // LordHavoc: changed to draw the deathmatch overlays in any multiplayer mode
- //if (cl.gametype == GAME_DEATHMATCH)
- if (!cl.islocalgame)
+ if (cl.gametype == GAME_DEATHMATCH)
{
Sbar_DeathmatchOverlay ();
return;
dig = (int)cl.completed_time / 60;
Sbar_DrawNum (160, 64, dig, 3, 0);
num = (int)cl.completed_time - dig*60;
- if (gamemode != GAME_NEXUIZ)
- Sbar_DrawPic (234,64,sb_colon);
+ Sbar_DrawPic (234,64,sb_colon);
Sbar_DrawPic (246,64,sb_nums[0][num/10]);
Sbar_DrawPic (266,64,sb_nums[0][num%10]);
projects / xonotic / darkplaces.git / blobdiff