From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 22 Dec 2007 10:17:43 +0000 (+0000)
Subject: showspeed cvar ;)
X-Git-Tag: xonotic-v0.1.0preview~2655
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=02018733a0af4a5622b3bad8f4a3754d16f3ca27;p=xonotic%2Fdarkplaces.git

showspeed cvar ;)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7836 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/darkplaces.txt b/darkplaces.txt
index 8c2153a3..6ba53506 100644
--- a/darkplaces.txt
+++ b/darkplaces.txt
@@ -825,6 +825,7 @@ showdate_format                                   %Y-%m-%d            format str
 showfps                                           0                   shows your rendered fps (frames per second)
 showpause                                         1                   show pause icon when game is paused
 showram                                           1                   show ram icon if low on surface cache memory (not used)
+showspeed                                         0                   shows your current speed (qu per second); number selects unit: 1 = qups, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots
 showtime                                          0                   shows current time of day (useful on screenshots)
 showtime_format                                   %H:%M:%S            format string for time of day
 showturtle                                        0                   show turtle icon when framerate is too low (not used)
diff --git a/sbar.c b/sbar.c
index deee45df..d7188792 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 showspeed = {CVAR_SAVE, "showspeed", "0", "shows your current speed (qu per second); number selects unit: 1 = qups, 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"};
 cvar_t showdate = {CVAR_SAVE, "showdate", "0", "shows current date (useful on screenshots)"};
@@ -369,6 +370,7 @@ void Sbar_Init (void)
 	Cmd_AddCommand("+showscores", Sbar_ShowScores, "show scoreboard");
 	Cmd_AddCommand("-showscores", Sbar_DontShowScores, "hide scoreboard");
 	Cvar_RegisterVariable(&showfps);
+	Cvar_RegisterVariable(&showspeed);
 	Cvar_RegisterVariable(&showtime);
 	Cvar_RegisterVariable(&showtime_format);
 	Cvar_RegisterVariable(&showdate);
@@ -1039,10 +1041,12 @@ void Sbar_ShowFPS(void)
 	char fpsstring[32];
 	char timestring[32];
 	char datestring[32];
+	char speedstring[32];
 	qboolean red = false;
 	fpsstring[0] = 0;
 	timestring[0] = 0;
 	datestring[0] = 0;
+	speedstring[0] = 0;
 	if (showfps.integer)
 	{
 		float calc;
@@ -1070,11 +1074,48 @@ 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 (fpsstring[0] || timestring[0])
+	if (showspeed.integer)
+	{
+		double speed, speedxy, f;
+		const char *unit;
+		speed = VectorLength(cl.movement_velocity);
+		speedxy = sqrt(cl.movement_velocity[0] * cl.movement_velocity[0] + cl.movement_velocity[1] * cl.movement_velocity[1]);
+		switch(showspeed.integer)
+		{
+			default:
+			case 1:
+				unit = "qups";
+				f = 1.0;
+				break;
+			case 2:
+				unit = "m/s";
+				f = 0.0254;
+				if(gamemode != GAME_NEXUIZ) f *= 1.5;
+				// 1qu=1.5in is for non-Nexuiz only - Nexuiz players are overly large, but 1qu=1in fixes that
+				break;
+			case 3:
+				unit = "km/h";
+				f = 0.0254 * 3.6;
+				if(gamemode != GAME_NEXUIZ) f *= 1.5;
+				break;
+			case 4:
+				unit = "mph";
+				f = 0.0254 * 3.6 * 0.6213711922;
+				if(gamemode != GAME_NEXUIZ) f *= 1.5;
+				break;
+			case 5:
+				unit = "knots";
+				f = 0.0254 * 1.943844492;
+				if(gamemode != GAME_NEXUIZ) f *= 1.5;
+				break;
+		}
+		dpsnprintf(speedstring, sizeof(speedstring), "%.0f (%.0f) %s", f*speed, f*speedxy, unit);
+	}
+	if (fpsstring[0] || timestring[0] || datestring[0] || speedstring[0])
 	{
 		fps_scalex = 12;
 		fps_scaley = 12;
-		fps_height = fps_scaley * ((fpsstring[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0));
+		fps_height = fps_scaley * ((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;
@@ -1102,6 +1143,13 @@ void Sbar_ShowFPS(void)
 			DrawQ_String_Font(fps_x, fps_y, datestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
 			fps_y += fps_scaley;
 		}
+		if (speedstring[0])
+		{
+			fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(speedstring, 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, speedstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+			fps_y += fps_scaley;
+		}
 	}
 }