X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sbar.c;h=5594495ef4a0702b61799fcb1f0867f8b76dcc27;hb=a3a9fdaf8edba37e4c895b2f10926481c46916a0;hp=e493b6ddcb708bfdb73dd0982bbd4cef77b24337;hpb=6658817fbe236cec63fbd07f3ff5d18ff2b324f6;p=xonotic%2Fdarkplaces.git diff --git a/sbar.c b/sbar.c index e493b6dd..5594495e 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"}; @@ -371,6 +372,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); @@ -456,7 +458,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 +493,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 +535,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 +682,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 +701,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 +713,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 +870,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 +949,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 +993,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 +1034,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; @@ -1081,6 +1075,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; @@ -1125,10 +1121,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; @@ -1302,50 +1305,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) @@ -1687,9 +1690,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) @@ -1711,9 +1714,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) @@ -1771,9 +1774,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)