cachepic_t *sb_finale;
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 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"};
Cmd_AddCommand("+showscores", Sbar_ShowScores, "show scoreboard");
Cmd_AddCommand("-showscores", Sbar_DontShowScores, "hide scoreboard");
Cvar_RegisterVariable(&showfps);
+ Cvar_RegisterVariable(&showsound);
Cvar_RegisterVariable(&showspeed);
Cvar_RegisterVariable(&showtime);
Cvar_RegisterVariable(&showtime_format);
static int fragsort[MAX_SCOREBOARD];
static int scoreboardlines;
-//[515]: Sbar_GetPlayer for csqc "getplayerkey" func
-int Sbar_GetPlayer (int index)
+int Sbar_GetSortedPlayerIndex (int index)
{
- if(index < 0)
- {
- index = -1-index;
- if(index >= scoreboardlines)
- return -1;
- index = fragsort[index];
- }
- if(index >= scoreboardlines)
- return -1;
- return index;
+ return index >= 0 && index < scoreboardlines ? fragsort[index] : -1;
}
static scoreboard_t teams[MAX_SCOREBOARD];
void Sbar_ShowFPS(void)
{
float fps_x, fps_y, fps_scalex, fps_scaley, fps_height;
+ char soundstring[32];
char fpsstring[32];
char timestring[32];
char datestring[32];
char speedstring[32];
qboolean red = false;
+ soundstring[0] = 0;
fpsstring[0] = 0;
timestring[0] = 0;
datestring[0] = 0;
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)
{
framerate = framecount / (newtime - lasttime);
+ if (nexttime < newtime - interval * 1.5)
+ nexttime = newtime;
lasttime = newtime;
- nexttime = max(nexttime + 1, lasttime - 1);
+ nexttime += interval;
framecount = 0;
}
framecount++;
strlcpy(timestring, Sys_TimeString(showtime_format.string), sizeof(timestring));
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);
if (showspeed.integer)
{
double speed, speedxy, f;
{
fps_scalex = 12;
fps_scaley = 12;
- fps_height = fps_scaley * ((fpsstring[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0) + (speedstring[0] != 0));
+ fps_height = fps_scaley * ((soundstring[0] != 0) + (fpsstring[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0) + (speedstring[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;
+ if (soundstring[0])
+ {
+ fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(soundstring, 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, soundstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+ fps_y += fps_scaley;
+ }
if (fpsstring[0])
{
fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(fpsstring, 0, true, FONT_INFOBAR) * fps_scalex;
// armor
if (cl.stats[STAT_ARMOR] > 0)
{
- Sbar_DrawStretchPic (0, 0, sb_armor[0], sbar_alpha_fg.value, 24, 24);
+ Sbar_DrawStretchPic (72, 0, sb_armor[0], sbar_alpha_fg.value, 24, 24);
if(cl.stats[STAT_ARMOR] > 200)
- Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,0,1,0,1,0);
+ Sbar_DrawXNum(0,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);
+ Sbar_DrawXNum(0,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);
+ Sbar_DrawXNum(0,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);
+ Sbar_DrawXNum(0,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);
+ Sbar_DrawXNum(0,0,cl.stats[STAT_ARMOR],3,24,0.7,0,0,1,0);
}
// health
if (cl.stats[STAT_HEALTH] != 0)
{
- Sbar_DrawStretchPic (112, 0, sb_health, sbar_alpha_fg.value, 24, 24);
+ Sbar_DrawStretchPic (184, 0, sb_health, sbar_alpha_fg.value, 24, 24);
if(cl.stats[STAT_HEALTH] > 200)
- Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,0,1,0,1,0);
+ Sbar_DrawXNum(112,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);
+ Sbar_DrawXNum(112,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);
+ Sbar_DrawXNum(112,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);
+ Sbar_DrawXNum(112,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);
+ Sbar_DrawXNum(112,0,cl.stats[STAT_HEALTH],3,24,0.7,0,0,1,0);
}
// ammo
if ((cl.stats[STAT_ITEMS] & (NEX_IT_SHELLS | NEX_IT_BULLETS | NEX_IT_ROCKETS | NEX_IT_CELLS)) || cl.stats[STAT_AMMO] != 0)
{
if (cl.stats[STAT_ITEMS] & NEX_IT_SHELLS)
- Sbar_DrawStretchPic (224, 0, sb_ammo[0], sbar_alpha_fg.value, 24, 24);
+ Sbar_DrawStretchPic (296, 0, sb_ammo[0], sbar_alpha_fg.value, 24, 24);
else if (cl.stats[STAT_ITEMS] & NEX_IT_BULLETS)
- Sbar_DrawStretchPic (224, 0, sb_ammo[1], sbar_alpha_fg.value, 24, 24);
+ Sbar_DrawStretchPic (296, 0, sb_ammo[1], sbar_alpha_fg.value, 24, 24);
else if (cl.stats[STAT_ITEMS] & NEX_IT_ROCKETS)
- Sbar_DrawStretchPic (224, 0, sb_ammo[2], sbar_alpha_fg.value, 24, 24);
+ Sbar_DrawStretchPic (296, 0, sb_ammo[2], sbar_alpha_fg.value, 24, 24);
else if (cl.stats[STAT_ITEMS] & NEX_IT_CELLS)
- Sbar_DrawStretchPic (224, 0, sb_ammo[3], sbar_alpha_fg.value, 24, 24);
+ Sbar_DrawStretchPic (296, 0, sb_ammo[3], sbar_alpha_fg.value, 24, 24);
if(cl.stats[STAT_AMMO] > 10)
- Sbar_DrawXNum(248, 0, cl.stats[STAT_AMMO], 3, 24, 0.6,0.7,0.8,1,0);
+ Sbar_DrawXNum(224, 0, cl.stats[STAT_AMMO], 3, 24, 0.6,0.7,0.8,1,0);
else
- Sbar_DrawXNum(248, 0, cl.stats[STAT_AMMO], 3, 24, 0.7,0,0,1,0);
+ Sbar_DrawXNum(224, 0, cl.stats[STAT_AMMO], 3, 24, 0.7,0,0,1,0);
}
if (sbar_x + 320 + 160 <= vid_conwidth.integer)
projects / xonotic / darkplaces.git / blobdiff