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 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 topspeed"};
+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_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"};
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);
// 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));
char timestring[32];
char datestring[32];
char speedstring[32];
- char topspeedstring[32];
+ char topspeedstring[48];
qboolean red = false;
soundstring[0] = 0;
fpsstring[0] = 0;
static double nexttime = 0, lasttime = 0;
static double framerate = 0;
static int framecount = 0;
- double interval = 0.25;
+ double interval = 1;
double newtime;
- newtime = realtime;
+ newtime = Sys_DoubleTime();
if (newtime >= nexttime)
{
- framerate = framecount / (newtime - lasttime);
+ if (framecount > 1) // frames per second
+ framerate = framecount / interval;
+ else // seconds per frame
+ framerate = framecount / (newtime - lasttime);
if (nexttime < newtime - interval * 1.5)
nexttime = newtime;
lasttime = newtime;
calc = framerate;
if ((red = (calc < 1.0f)))
- dpsnprintf(fpsstring, sizeof(fpsstring), "%4i spf", (int)(1.0f / calc + 0.5));
+ dpsnprintf(fpsstring, sizeof(fpsstring), "%4i spf", (int)(1.0 / calc + 0.5));
else
dpsnprintf(fpsstring, sizeof(fpsstring), "%4i fps", (int)(calc + 0.5));
}
if (showdate.integer)
strlcpy(datestring, Sys_TimeString(showdate_format.string), sizeof(datestring));
if (showsound.integer)
- dpsnprintf(soundstring, sizeof(soundstring), "%4i/%4i at %3ims\n", cls.soundstats.mixedsounds, cls.soundstats.totalsounds, cls.soundstats.latency_milliseconds);
+ 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;
else
topspeedxy_latched = true;
dpsnprintf(topspeedstring, sizeof(topspeedstring), "%s%.0f%s (%s%.0f%s) %s",
- topspeed_latched ? "^xf00" : "^xf88", f*topspeed, "^xf88",
- topspeedxy_latched ? "^xf00" : "^xf88", f*topspeedxy, "^xf88",
+ topspeed_latched ? "^1" : "^xf88", f*topspeed, "^xf88",
+ topspeedxy_latched ? "^1" : "^xf88", f*topspeedxy, "^xf88",
unit);
time(¤t_time);
}
fps_height = fps_scaley * ((soundstring[0] != 0) + (fpsstring[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;
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