X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sbar.c;h=9e67b21a3d6bc5d95d2a358fafd22a80209825ec;hb=dfd0f25d0d8f8a17868ca8657df5c25d08925149;hp=ef7a0bcbe692ccb4f8b18ea1ee8e3dfd4542f865;hpb=8d376b57de94bafd3bae224088b469649c853028;p=xonotic%2Fdarkplaces.git diff --git a/sbar.c b/sbar.c index ef7a0bcb..9e67b21a 100644 --- a/sbar.c +++ b/sbar.c @@ -88,6 +88,7 @@ cachepic_t *sb_inter; 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"}; @@ -96,6 +97,8 @@ cvar_t showdate_format = {CVAR_SAVE, "showdate_format", "%Y-%m-%d", "format stri 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"}; @@ -371,6 +374,7 @@ void Sbar_Init (void) 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); @@ -379,6 +383,8 @@ void Sbar_Init (void) 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); @@ -456,7 +462,7 @@ void Sbar_DrawNum (int x, int y, int num, int digits, int color) 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); @@ -491,10 +497,10 @@ void Sbar_DrawXNum (int x, int y, int num, int digits, int lettersize, float r, 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); @@ -533,19 +539,9 @@ Sbar_SortFrags 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]; @@ -690,7 +686,7 @@ void Sbar_SoloScoreboard (void) *(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; @@ -709,10 +705,10 @@ void Sbar_SoloScoreboard (void) 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); } @@ -721,7 +717,7 @@ void Sbar_SoloScoreboard (void) 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 @@ -878,7 +874,7 @@ void Sbar_DrawInventory (void) // 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] != ' ') @@ -957,7 +953,7 @@ void Sbar_DrawFrags (void) // draw number f = s->frags; - sprintf (num, "%3i",f); + dpsnprintf (num, sizeof(num), "%3i",f); if (k == cl.viewentity - 1) { @@ -1001,7 +997,7 @@ void Sbar_DrawFace (void) // draw number f = s->frags; - sprintf (num, "%3i",f); + dpsnprintf (num, sizeof(num), "%3i",f); if ((s->colors & 0xf0)==0) { @@ -1042,11 +1038,13 @@ void Sbar_DrawFace (void) 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; @@ -1057,13 +1055,16 @@ void Sbar_ShowFPS(void) 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++; @@ -1078,6 +1079,8 @@ void Sbar_ShowFPS(void) 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; @@ -1122,10 +1125,17 @@ void Sbar_ShowFPS(void) { 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; @@ -1299,50 +1309,50 @@ void Sbar_Draw (void) // 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) @@ -1684,9 +1694,9 @@ float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y) // // 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) @@ -1708,9 +1718,9 @@ float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y) { // 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) @@ -1768,9 +1778,9 @@ void Sbar_DeathmatchOverlay (void) 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) @@ -1921,11 +1931,12 @@ void Sbar_Score (int margin) 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()) { @@ -2015,7 +2026,7 @@ void Sbar_Score (int margin) } } - 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); @@ -2039,7 +2050,7 @@ void Sbar_Score (int margin) 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);