// sbar.c -- status bar code
#include "quakedef.h"
+#include "time.h"
cachepic_t *sb_disc;
cvar_t showfps = {CVAR_SAVE, "showfps", "0", "shows your rendered fps (frames per second)"};
cvar_t showsound = {CVAR_SAVE, "showsound", "0", "shows number of active sound sources, sound latency, and other statistics"};
+cvar_t showblur = {CVAR_SAVE, "showblur", "0", "shows the current alpha level of motionblur"};
cvar_t showspeed = {CVAR_SAVE, "showspeed", "0", "shows your current speed (qu per second); number selects unit: 1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots"};
+cvar_t showtopspeed = {CVAR_SAVE, "showtopspeed", "0", "shows your top speed (kept on screen for max 3 seconds); value -1 takes over the unit from showspeed, otherwise it's an unit number just like in showspeed"};
cvar_t showtime = {CVAR_SAVE, "showtime", "0", "shows current time of day (useful on screenshots)"};
cvar_t showtime_format = {CVAR_SAVE, "showtime_format", "%H:%M:%S", "format string for time of day"};
cvar_t showdate = {CVAR_SAVE, "showdate", "0", "shows current date (useful on screenshots)"};
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_t sbar_info_pos = {CVAR_SAVE, "sbar_info_pos", "0", "pixel position of the info strings (such as showfps), from the bottom"};
cvar_t cl_deathscoreboard = {0, "cl_deathscoreboard", "1", "shows scoreboard (+showscores) while dead"};
{
int i;
- if (gamemode == GAME_DELUXEQUAKE)
+ if (gamemode == GAME_DELUXEQUAKE || gamemode == GAME_BLOODOMNICIDE)
{
}
else if (gamemode == GAME_SOM)
Cmd_AddCommand("-showscores", Sbar_DontShowScores, "hide scoreboard");
Cvar_RegisterVariable(&showfps);
Cvar_RegisterVariable(&showsound);
+ Cvar_RegisterVariable(&showblur);
Cvar_RegisterVariable(&showspeed);
+ Cvar_RegisterVariable(&showtopspeed);
Cvar_RegisterVariable(&showtime);
Cvar_RegisterVariable(&showtime_format);
Cvar_RegisterVariable(&showdate);
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(&sbar_info_pos);
Cvar_RegisterVariable(&cl_deathscoreboard);
Cvar_RegisterVariable(&crosshair_color_red);
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);
//=============================================================================
-int Sbar_IsTeammatch()
+int Sbar_IsTeammatch(void)
{
// currently only nexuiz uses the team score board
return ((gamemode == GAME_NEXUIZ)
// monsters and secrets are now both on the top row
if (cl.stats[STAT_TOTALMONSTERS])
Sbar_DrawString(8, 4, va("Monsters:%3i /%3i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]));
+ else if (cl.stats[STAT_MONSTERS]) // LA: Display something if monsters_killed is non-zero, but total_monsters is zero
+ Sbar_DrawString(8, 4, va("Monsters:%3i", cl.stats[STAT_MONSTERS]));
+
if (cl.stats[STAT_TOTALSECRETS])
Sbar_DrawString(8+22*8, 4, va("Secrets:%3i /%3i", cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]));
+ else if (cl.stats[STAT_SECRETS]) // LA: And similarly for secrets
+ Sbar_DrawString(8+22*8, 4, va("Secrets:%3i", cl.stats[STAT_SECRETS]));
// figure out the map's filename without path or extension
strlcpy(str, FS_FileWithoutPath(cl.worldmodel ? cl.worldmodel->name : ""), sizeof(str));
*(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)
{
Sbar_DrawPic (112, 0, sb_faces[f][cl.time <= cl.faceanimtime]);
}
}
+double topspeed = 0;
+double topspeedxy = 0;
+time_t current_time = 3;
+time_t top_time = 0;
+time_t topxy_time = 0;
+
+static void get_showspeed_unit(int unitnumber, double *conversion_factor, const char **unit)
+{
+ if(unitnumber < 0)
+ unitnumber = showspeed.integer;
+ switch(unitnumber)
+ {
+ default:
+ case 1:
+ if(gamemode == GAME_NEXUIZ)
+ *unit = "in/s";
+ else
+ *unit = "qu/s";
+ *conversion_factor = 1.0;
+ break;
+ case 2:
+ *unit = "m/s";
+ *conversion_factor = 0.0254;
+ if(gamemode != GAME_NEXUIZ) *conversion_factor *= 1.5;
+ // 1qu=1.5in is for non-Nexuiz only - Nexuiz players are overly large, but 1qu=1in fixes that
+ break;
+ case 3:
+ *unit = "km/h";
+ *conversion_factor = 0.0254 * 3.6;
+ if(gamemode != GAME_NEXUIZ) *conversion_factor *= 1.5;
+ break;
+ case 4:
+ *unit = "mph";
+ *conversion_factor = 0.0254 * 3.6 * 0.6213711922;
+ if(gamemode != GAME_NEXUIZ) *conversion_factor *= 1.5;
+ break;
+ case 5:
+ *unit = "knots";
+ *conversion_factor = 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h
+ if(gamemode != GAME_NEXUIZ) *conversion_factor *= 1.5;
+ break;
+ }
+}
+
+static double showfps_nexttime = 0, showfps_lasttime = -1;
+static double showfps_framerate = 0;
+static int showfps_framecount = 0;
+
+void Sbar_ShowFPS_Update(void)
+{
+ double interval = 1;
+ double newtime;
+ newtime = realtime;
+ if (newtime >= showfps_nexttime)
+ {
+ showfps_framerate = showfps_framecount / (newtime - showfps_lasttime);
+ if (showfps_nexttime < newtime - interval * 1.5)
+ showfps_nexttime = newtime;
+ showfps_lasttime = newtime;
+ showfps_nexttime += interval;
+ showfps_framecount = 0;
+ }
+ showfps_framecount++;
+}
void Sbar_ShowFPS(void)
{
char fpsstring[32];
char timestring[32];
char datestring[32];
+ char timedemostring1[32];
+ char timedemostring2[32];
char speedstring[32];
+ char blurstring[32];
+ char topspeedstring[48];
qboolean red = false;
soundstring[0] = 0;
fpsstring[0] = 0;
+ timedemostring1[0] = 0;
+ timedemostring2[0] = 0;
timestring[0] = 0;
datestring[0] = 0;
speedstring[0] = 0;
+ blurstring[0] = 0;
+ topspeedstring[0] = 0;
if (showfps.integer)
{
- float calc;
- static double nexttime = 0, lasttime = 0;
- static double framerate = 0;
- static int framecount = 0;
- double interval = 0.25;
- double newtime;
- newtime = realtime;
- if (newtime >= nexttime)
+ red = (showfps_framerate < 1.0f);
+ if(showfps.integer == 2)
+ dpsnprintf(fpsstring, sizeof(fpsstring), "%7.3f mspf", (1000.0 / showfps_framerate));
+ else if (red)
+ dpsnprintf(fpsstring, sizeof(fpsstring), "%4i spf", (int)(1.0 / showfps_framerate + 0.5));
+ else
+ dpsnprintf(fpsstring, sizeof(fpsstring), "%4i fps", (int)(showfps_framerate + 0.5));
+ if (cls.timedemo)
{
- framerate = framecount / (newtime - lasttime);
- if (nexttime < newtime - interval * 1.5)
- nexttime = newtime;
- lasttime = newtime;
- nexttime += interval;
- framecount = 0;
+ dpsnprintf(timedemostring1, sizeof(timedemostring1), "frame%4i %f", cls.td_frames, realtime - cls.td_starttime);
+ dpsnprintf(timedemostring2, sizeof(timedemostring2), "%i seconds %3.0f/%3.0f/%3.0f fps", cls.td_onesecondavgcount, cls.td_onesecondminfps, cls.td_onesecondavgfps / max(1, cls.td_onesecondavgcount), cls.td_onesecondmaxfps);
}
- framecount++;
- calc = framerate;
-
- if ((red = (calc < 1.0f)))
- dpsnprintf(fpsstring, sizeof(fpsstring), "%4i spf", (int)(1.0f / calc + 0.5));
- else
- dpsnprintf(fpsstring, sizeof(fpsstring), "%4i fps", (int)(calc + 0.5));
}
if (showtime.integer)
strlcpy(timestring, Sys_TimeString(showtime_format.string), sizeof(timestring));
if (showdate.integer)
strlcpy(datestring, Sys_TimeString(showdate_format.string), sizeof(datestring));
+ if (showblur.integer)
+ dpsnprintf(blurstring, sizeof(blurstring), "%3i%% blur", (int)(cl.motionbluralpha * 100));
if (showsound.integer)
- dpsnprintf(soundstring, sizeof(soundstring), "%4i/%4i at %3ims\n", cls.soundstats.mixedsounds, cls.soundstats.totalsounds, cls.soundstats.latency_milliseconds);
- if (showspeed.integer)
+ dpsnprintf(soundstring, sizeof(soundstring), "%4i/4%i at %3ims", cls.soundstats.mixedsounds, cls.soundstats.totalsounds, cls.soundstats.latency_milliseconds);
+ if (showspeed.integer || showtopspeed.integer)
{
double speed, speedxy, f;
const char *unit;
speed = VectorLength(cl.movement_velocity);
speedxy = sqrt(cl.movement_velocity[0] * cl.movement_velocity[0] + cl.movement_velocity[1] * cl.movement_velocity[1]);
- switch(showspeed.integer)
+ if (showspeed.integer)
{
- default:
- case 1:
- if(gamemode == GAME_NEXUIZ)
- unit = "in/s";
- else
- unit = "qu/s";
- f = 1.0;
- break;
- case 2:
- unit = "m/s";
- f = 0.0254;
- if(gamemode != GAME_NEXUIZ) f *= 1.5;
- // 1qu=1.5in is for non-Nexuiz only - Nexuiz players are overly large, but 1qu=1in fixes that
- break;
- case 3:
- unit = "km/h";
- f = 0.0254 * 3.6;
- if(gamemode != GAME_NEXUIZ) f *= 1.5;
- break;
- case 4:
- unit = "mph";
- f = 0.0254 * 3.6 * 0.6213711922;
- if(gamemode != GAME_NEXUIZ) f *= 1.5;
- break;
- case 5:
- unit = "knots";
- f = 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h
- if(gamemode != GAME_NEXUIZ) f *= 1.5;
- break;
+ get_showspeed_unit(showspeed.integer, &f, &unit);
+ dpsnprintf(speedstring, sizeof(speedstring), "%.0f (%.0f) %s", f*speed, f*speedxy, unit);
+ }
+ if (showtopspeed.integer)
+ {
+ qboolean topspeed_latched = false, topspeedxy_latched = false;
+ get_showspeed_unit(showtopspeed.integer, &f, &unit);
+ if (speed >= topspeed || current_time - top_time > 3)
+ {
+ topspeed = speed;
+ time(&top_time);
+ }
+ else
+ topspeed_latched = true;
+ if (speedxy >= topspeedxy || current_time - topxy_time > 3)
+ {
+ topspeedxy = speedxy;
+ time(&topxy_time);
+ }
+ else
+ topspeedxy_latched = true;
+ dpsnprintf(topspeedstring, sizeof(topspeedstring), "%s%.0f%s (%s%.0f%s) %s",
+ topspeed_latched ? "^1" : "^xf88", f*topspeed, "^xf88",
+ topspeedxy_latched ? "^1" : "^xf88", f*topspeedxy, "^xf88",
+ unit);
+ time(¤t_time);
}
- dpsnprintf(speedstring, sizeof(speedstring), "%.0f (%.0f) %s", f*speed, f*speedxy, unit);
}
- if (fpsstring[0] || timestring[0] || datestring[0] || speedstring[0])
+ if (fpsstring[0] || timedemostring1[0] || timedemostring2[0] || timestring[0] || datestring[0] || speedstring[0] || blurstring[0] || topspeedstring[0])
{
fps_scalex = 12;
fps_scaley = 12;
- fps_height = fps_scaley * ((soundstring[0] != 0) + (fpsstring[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0) + (speedstring[0] != 0));
+ fps_height = fps_scaley * ((soundstring[0] != 0) + (blurstring[0] != 0) + (fpsstring[0] != 0) + (timedemostring1[0] != 0) + (timedemostring2[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0) + (speedstring[0] != 0) + (topspeedstring[0] != 0));
//fps_y = vid_conheight.integer - sb_lines; // yes this may draw over the sbar
//fps_y = bound(0, fps_y, vid_conheight.integer - fps_height);
- fps_y = vid_conheight.integer - fps_height;
+ fps_y = vid_conheight.integer - sbar_info_pos.integer - fps_height;
if (soundstring[0])
{
fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(soundstring, 0, true, FONT_INFOBAR) * fps_scalex;
DrawQ_String_Font(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
fps_y += fps_scaley;
}
+ if (timedemostring1[0])
+ {
+ fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(timedemostring1, 0, true, FONT_INFOBAR) * fps_scalex;
+ DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0);
+ DrawQ_String_Font(fps_x, fps_y, timedemostring1, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+ fps_y += fps_scaley;
+ }
+ if (timedemostring2[0])
+ {
+ fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(timedemostring2, 0, true, FONT_INFOBAR) * fps_scalex;
+ DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0);
+ DrawQ_String_Font(fps_x, fps_y, timedemostring2, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+ fps_y += fps_scaley;
+ }
if (timestring[0])
{
fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(timestring, 0, true, FONT_INFOBAR) * fps_scalex;
DrawQ_String_Font(fps_x, fps_y, speedstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
fps_y += fps_scaley;
}
+ if (topspeedstring[0])
+ {
+ fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(topspeedstring, 0, false, FONT_INFOBAR) * fps_scalex;
+ DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0);
+ DrawQ_String_Font(fps_x, fps_y, topspeedstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, false, FONT_INFOBAR);
+ fps_y += fps_scaley;
+ }
+ if (blurstring[0])
+ {
+ fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(blurstring, 0, true, FONT_INFOBAR) * fps_scalex;
+ DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0);
+ DrawQ_String_Font(fps_x, fps_y, blurstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+ fps_y += fps_scaley;
+ }
}
}
{
// The Impossible Combination[tm]
// Can only happen in Key Hunt mode...
- Sbar_DrawPic (x, (vid_conheight.integer - sbar_y) - (sbar_flagstatus_pos.value + 128), sb_items[14]);
+ Sbar_DrawPic ((int) x, (int) ((vid_conheight.integer - sbar_y) - (sbar_flagstatus_pos.value + 128)), sb_items[14]);
}
else
{
if (redflag)
- Sbar_DrawPic (x, (vid_conheight.integer - sbar_y) - (sbar_flagstatus_pos.value + 64), sb_items[redflag+10]);
+ Sbar_DrawPic ((int) x, (int) ((vid_conheight.integer - sbar_y) - (sbar_flagstatus_pos.value + 64)), sb_items[redflag+10]);
if (blueflag)
- Sbar_DrawPic (x, (vid_conheight.integer - sbar_y) - (sbar_flagstatus_pos.value + 128), sb_items[blueflag+14]);
+ Sbar_DrawPic ((int) x, (int) ((vid_conheight.integer - sbar_y) - (sbar_flagstatus_pos.value + 128)), sb_items[blueflag+14]);
}
// armor
{
// The Impossible Combination[tm]
// Can only happen in Key Hunt mode...
- Sbar_DrawPic (x, -179, sb_items[14]);
+ Sbar_DrawPic ((int) x, -179, sb_items[14]);
}
else
{
if (redflag)
- Sbar_DrawPic (x, -117, sb_items[redflag+10]);
+ Sbar_DrawPic ((int) x, -117, sb_items[redflag+10]);
if (blueflag)
- Sbar_DrawPic (x, -177, sb_items[blueflag+14]);
+ Sbar_DrawPic ((int) x, -177, sb_items[blueflag+14]);
}
// armor
}
}
- Sbar_ShowFPS();
-
if (cl.csqc_vidvars.drawcrosshair && crosshair.integer >= 1 && !cl.intermission && !r_letterbox.value)
{
pic = Draw_CachePic (va("gfx/crosshair%i", crosshair.integer));
//
//
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 = (int) (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 = (int) (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)
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;
+ y = (int) (vid_conheight.integer - sbar_miniscoreboard_size.value * 8);
// scores
Sbar_SortFrags ();
int sbar_x_save = sbar_x;
int sbar_y_save = sbar_y;
- sbar_y = vid_conheight.value - (32+12);
+
+ sbar_y = (int) (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);
Sbar_DrawPic (246,64,sb_nums[0][num/10]);
Sbar_DrawPic (266,64,sb_nums[0][num%10]);
- Sbar_DrawNum (160, 104, cl.stats[STAT_SECRETS], 3, 0);
- if (gamemode != GAME_NEXUIZ)
- Sbar_DrawPic (232, 104, sb_slash);
- Sbar_DrawNum (240, 104, cl.stats[STAT_TOTALSECRETS], 3, 0);
-
- Sbar_DrawNum (160, 144, cl.stats[STAT_MONSTERS], 3, 0);
- if (gamemode != GAME_NEXUIZ)
- Sbar_DrawPic (232, 144, sb_slash);
- Sbar_DrawNum (240, 144, cl.stats[STAT_TOTALMONSTERS], 3, 0);
+// LA: Display as "a" instead of "a/b" if b is 0
+ if(cl.stats[STAT_TOTALSECRETS])
+ {
+ Sbar_DrawNum (160, 104, cl.stats[STAT_SECRETS], 3, 0);
+ if (gamemode != GAME_NEXUIZ)
+ Sbar_DrawPic (232, 104, sb_slash);
+ Sbar_DrawNum (240, 104, cl.stats[STAT_TOTALSECRETS], 3, 0);
+ }
+ else
+ {
+ Sbar_DrawNum (240, 104, cl.stats[STAT_SECRETS], 3, 0);
+ }
+ if(cl.stats[STAT_TOTALMONSTERS])
+ {
+ Sbar_DrawNum (160, 144, cl.stats[STAT_MONSTERS], 3, 0);
+ if (gamemode != GAME_NEXUIZ)
+ Sbar_DrawPic (232, 144, sb_slash);
+ Sbar_DrawNum (240, 144, cl.stats[STAT_TOTALMONSTERS], 3, 0);
+ }
+ else
+ {
+ Sbar_DrawNum (240, 144, cl.stats[STAT_MONSTERS], 3, 0);
+ }
}
projects / xonotic / darkplaces.git / blobdiff