X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sbar.c;h=f760c90a36fa4367d3fe304b8c72dfadd258bc00;hb=663279ba8feeb4c114df0950bbc820f3bb32dcdc;hp=ef7a0bcbe692ccb4f8b18ea1ee8e3dfd4542f865;hpb=8d376b57de94bafd3bae224088b469649c853028;p=xonotic%2Fdarkplaces.git

diff --git a/sbar.c b/sbar.c
index ef7a0bcb..f760c90a 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);
@@ -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];
@@ -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;
@@ -1057,13 +1051,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 +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;
@@ -1122,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;