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_scorerank = {CVAR_SAVE, "sbar_scorerank", "1", "shows an overlay for your score (or team score) and rank in the scoreboard"};
+cvar_t sbar_gametime = {CVAR_SAVE, "sbar_gametime", "1", "shows an overlay for the time left in the current match/level (or current game time if there is no timelimit set)"};
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 sbar_flagstatus_pos = {CVAR_SAVE, "sbar_flagstatus_pos", "115", "pixel position of the Nexuiz flag status icons, from the bottom"};
Cvar_RegisterVariable(&sbar_alpha_bg);
Cvar_RegisterVariable(&sbar_alpha_fg);
Cvar_RegisterVariable(&sbar_hudselector);
+ Cvar_RegisterVariable(&sbar_scorerank);
+ Cvar_RegisterVariable(&sbar_gametime);
Cvar_RegisterVariable(&sbar_miniscoreboard_size);
Cvar_RegisterVariable(&cl_deathscoreboard);
char str[32], *ptr;
int l, frame;
- l = sprintf(str, "%i", num);
+ l = dpsnprintf(str, sizeof(str), "%i", num);
ptr = str;
if (l > digits)
ptr += (l-digits);
if (digits < 0)
{
digits = -digits;
- l = sprintf(str, "%0*i", digits, num);
+ l = dpsnprintf(str, sizeof(str), "%0*i", digits, num);
}
else
- l = sprintf(str, "%i", num);
+ l = dpsnprintf(str, sizeof(str), "%i", num);
ptr = str;
if (l > digits)
ptr += (l-digits);
*(strchr(str, '\n')) = 0;
// make the time string
- timelen = sprintf(timestr, " %i:%02i", minutes, seconds);
+ timelen = dpsnprintf(timestr, sizeof(timestr), " %i:%02i", minutes, seconds);
// truncate the level name if necessary to make room for time
max = 38 - timelen;
int l;
if (gamemode != GAME_NEXUIZ) {
- sprintf (str,"Monsters:%3i /%3i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]);
+ dpsnprintf (str, sizeof(str), "Monsters:%3i /%3i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]);
Sbar_DrawString (8, 4, str);
- sprintf (str,"Secrets :%3i /%3i", cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]);
+ dpsnprintf (str, sizeof(str), "Secrets :%3i /%3i", cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]);
Sbar_DrawString (8, 12, str);
}
seconds = (int)(cl.time - 60*minutes);
tens = seconds / 10;
units = seconds - 10*tens;
- sprintf (str,"Time :%3i:%i%i", minutes, tens, units);
+ dpsnprintf (str, sizeof(str), "Time :%3i:%i%i", minutes, tens, units);
Sbar_DrawString (184, 4, str);
// draw level name
// ammo counts
for (i=0 ; i<4 ; i++)
{
- sprintf (num, "%4i",cl.stats[STAT_SHELLS+i] );
+ dpsnprintf (num, sizeof(num), "%4i",cl.stats[STAT_SHELLS+i] );
if (num[0] != ' ')
Sbar_DrawCharacter ( (6*i+0)*8 - 2, -24, 18 + num[0] - '0');
if (num[1] != ' ')
// draw number
f = s->frags;
- sprintf (num, "%3i",f);
+ dpsnprintf (num, sizeof(num), "%3i",f);
if (k == cl.viewentity - 1)
{
// draw number
f = s->frags;
- sprintf (num, "%3i",f);
+ dpsnprintf (num, sizeof(num), "%3i",f);
if ((s->colors & 0xf0)==0)
{
//
//
c = palette_rgb_pantsscoreboard[(s->colors & 0xf0) >> 4];
- DrawQ_Fill(x + 14*8*FONT_SBAR->width_of[0], y+1, 40*FONT_SBAR->width_of[0], 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0);
+ DrawQ_Fill(x + 14*8*FONT_SBAR->maxwidth, y+1, 40*FONT_SBAR->maxwidth, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0);
c = palette_rgb_shirtscoreboard[s->colors & 0xf];
- DrawQ_Fill(x + 14*8*FONT_SBAR->width_of[0], y+4, 40*FONT_SBAR->width_of[0], 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0);
+ DrawQ_Fill(x + 14*8*FONT_SBAR->maxwidth, y+4, 40*FONT_SBAR->maxwidth, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (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);
if (s->qw_ping || s->qw_packetloss)
{
// draw colors behind score
c = palette_rgb_pantsscoreboard[(s->colors & 0xf0) >> 4];
- DrawQ_Fill(x + 9*8*FONT_SBAR->width_of[0], y+1, 40*FONT_SBAR->width_of[0], 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0);
+ DrawQ_Fill(x + 9*8*FONT_SBAR->maxwidth, y+1, 40*FONT_SBAR->maxwidth, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0);
c = palette_rgb_shirtscoreboard[s->colors & 0xf];
- DrawQ_Fill(x + 9*8*FONT_SBAR->width_of[0], y+4, 40*FONT_SBAR->width_of[0], 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0);
+ DrawQ_Fill(x + 9*8*FONT_SBAR->maxwidth, y+4, 40*FONT_SBAR->maxwidth, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (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);
if (s->qw_ping || s->qw_packetloss)
ymax = 40 + 8 + (Sbar_IsTeammatch() ? (teamlines * 8 + 5): 0) + scoreboardlines * 8 - 1;
if (cls.protocol == PROTOCOL_QUAKEWORLD)
- xmin = (vid_conwidth.integer - (26 + 15) * 8 * FONT_SBAR->width_of[0]) / 2; // 26 characters until name, then we assume 15 character names (they can be longer but usually aren't)
+ xmin = (vid_conwidth.integer - (26 + 15) * 8 * FONT_SBAR->maxwidth) / 2; // 26 characters until name, then we assume 15 character names (they can be longer but usually aren't)
else
- xmin = (vid_conwidth.integer - (16 + 25) * 8 * FONT_SBAR->width_of[0]) / 2; // 16 characters until name, then we assume 25 character names (they can be longer but usually aren't)
+ xmin = (vid_conwidth.integer - (16 + 25) * 8 * FONT_SBAR->maxwidth) / 2; // 16 characters until name, then we assume 25 character names (they can be longer but usually aren't)
xmax = vid_conwidth.integer - xmin;
if(gamemode == GAME_NEXUIZ)
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_scorerank.integer && me >= 0 && me < cl.maxclients)
{
if(Sbar_IsTeammatch())
{
}
}
- if (cl.statsf[STAT_TIMELIMIT])
+ if (sbar_gametime.integer && cl.statsf[STAT_TIMELIMIT])
{
timeleft = max(0, cl.statsf[STAT_TIMELIMIT] * 60 - cl.time);
minutes = (int)floor(timeleft / 60);
else
Sbar_DrawXNum(-12*2, 32, seconds, -2, 12, 1, 0, 0, 1, 0);
}
- else
+ else if (sbar_gametime.integer)
{
minutes = (int)floor(cl.time / 60);
seconds = (int)(floor(cl.time) - minutes * 60);