From 24eec2e6788049d6ebe7d9f6b8fe757663a4c74b Mon Sep 17 00:00:00 2001
From: Bryce Hutchings <niceass@rq3.com>
Date: Mon, 24 Jun 2002 05:55:50 +0000
Subject: [PATCH] drawping

---
 reaction/cgame/cg_draw.c  | 56 ++++++++++++++++++++++++++++-----------
 reaction/cgame/cg_local.h |  4 +++
 reaction/cgame/cg_main.c  |  5 ++++
 3 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/reaction/cgame/cg_draw.c b/reaction/cgame/cg_draw.c
index fb769b0e..8a0d5f85 100644
--- a/reaction/cgame/cg_draw.c
+++ b/reaction/cgame/cg_draw.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.52  2002/06/24 05:55:50  niceass
+// drawping
+//
 // Revision 1.51  2002/06/23 23:09:20  niceass
 // modified upper right scores
 //
@@ -587,12 +590,11 @@ static float CG_DrawSnapshot(float y)
 static float CG_DrawScore(float y)
 {
 	char *s;
-	int w, x;
+	int w, x = 0;
 	float BColor[4], FColor[4];
 
 	y += 4;
 
-	// What about spectator?
 	MAKERGBA(FColor, 0.0f, 0.0f, 0.0f, 1.0f);
 
 	if (cgs.gametype >= GT_TEAM) {
@@ -655,11 +657,12 @@ static float CG_DrawScore(float y)
 
 /*
 ==================
-CG_DrawFPS
+CG_DrawFPSandPing
 ==================
 */
-#define	FPS_FRAMES	4
-static float CG_DrawFPS(float y)
+#define	FPS_FRAMES	8			// NiceAss: Increased from 4 for a smoother average.
+
+static float CG_DrawFPSandPing(float y)
 {
 	char *s;
 	int w;
@@ -668,7 +671,7 @@ static float CG_DrawFPS(float y)
 	int i, total;
 	int fps;
 	static int previous;
-	int t, frameTime;
+	int t, frameTime, x = 0;
 	float Color[4];
 
 	// don't use serverTime, because that will be drifting to
@@ -692,18 +695,41 @@ static float CG_DrawFPS(float y)
 		}
 		fps = 1000 * FPS_FRAMES / total;
 
-		s = va("%ifps", fps);
-		w = CG_DrawStrlen(s) * SMALLCHAR_WIDTH;
+		if (cg_drawFPS.integer) {
+			s = va("%ifps", fps);
+			w = CG_DrawStrlen(s) * SMALLCHAR_WIDTH;
+			x = w;
 
-		MAKERGBA(Color, 0.0f, 0.0f, 0.0f, 0.4f);
-		CG_FillRect(631 - w - 3, y - 1, w + 6, SMALLCHAR_HEIGHT + 6, Color);
+			MAKERGBA(Color, 0.0f, 0.0f, 0.0f, 0.4f);
+			CG_FillRect(631 - x - 3, y - 1, w + 6, SMALLCHAR_HEIGHT + 6, Color);
 
-		MAKERGBA(Color, 0.0f, 0.0f, 0.0f, 1.0f);
-		CG_DrawCleanRect(631 - w - 3, y - 1, w + 6, SMALLCHAR_HEIGHT + 6, 1, Color);
+			MAKERGBA(Color, 0.0f, 0.0f, 0.0f, 1.0f);
+			CG_DrawCleanRect(631 - x - 3, y - 1, w + 6, SMALLCHAR_HEIGHT + 6, 1, Color);
 
-		CG_DrawSmallString(631 - w, y + 2, s, 1.0F);
+			CG_DrawSmallString(631 - x, y + 2, s, 1.0F);
+
+			x += 9;
+		}
+
+		// Draw ping here:
+		if (cg_drawPing.integer) {
+			s = va("%ims", cg.snap->ping);
+			w = CG_DrawStrlen(s) * SMALLCHAR_WIDTH;
+			x += w;
+
+			MAKERGBA(Color, 0.0f, 0.0f, 0.0f, 0.4f);
+			CG_FillRect(631 - x - 3, y - 1, w + 6, SMALLCHAR_HEIGHT + 6, Color);
+
+			MAKERGBA(Color, 0.0f, 0.0f, 0.0f, 1.0f);
+			CG_DrawCleanRect(631 - x - 3, y - 1, w + 6, SMALLCHAR_HEIGHT + 6, 1, Color);
+
+			CG_DrawSmallString(631 - x, y + 2, s, 1.0F);
+		}	
 	}
 
+	if (!cg_drawFPS.integer && !cg_drawPing.integer)
+		return y;
+
 	return y + SMALLCHAR_HEIGHT + 4;
 }
 
@@ -924,9 +950,7 @@ static void CG_DrawUpperRight(void)
 		y = CG_DrawSnapshot(y);
 	}
 	y = CG_DrawScore(y);
-	if (cg_drawFPS.integer) {
-		y = CG_DrawFPS(y);
-	}
+	y = CG_DrawFPSandPing(y);
 	if (cg_drawTimer.integer) {
 		y = CG_DrawTimer(y);
 	}
diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h
index d9303afb..af101664 100644
--- a/reaction/cgame/cg_local.h
+++ b/reaction/cgame/cg_local.h
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.102  2002/06/24 05:55:24  niceass
+// drawping
+//
 // Revision 1.101  2002/06/23 04:36:02  niceass
 // change to foglaser
 //
@@ -1508,6 +1511,7 @@ extern vmCvar_t cg_shadows;
 extern vmCvar_t cg_gibs;
 extern vmCvar_t cg_drawTimer;
 extern vmCvar_t cg_drawFPS;
+extern vmCvar_t cg_drawPing;
 extern vmCvar_t cg_drawSnapshot;
 extern vmCvar_t cg_draw3dIcons;
 extern vmCvar_t cg_drawIcons;
diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c
index d127433f..9e57bb90 100644
--- a/reaction/cgame/cg_main.c
+++ b/reaction/cgame/cg_main.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.89  2002/06/24 05:55:03  niceass
+// drawping
+//
 // Revision 1.88  2002/06/21 23:20:34  blaze
 // cg_rq3_overlaycrosshair when set to 1 will draw your non zoomed crosshair overtop of your ssg crosshair
 //
@@ -253,6 +256,7 @@ vmCvar_t cg_shadows;
 vmCvar_t cg_gibs;
 vmCvar_t cg_drawTimer;
 vmCvar_t cg_drawFPS;
+vmCvar_t cg_drawPing;
 vmCvar_t cg_drawSnapshot;
 vmCvar_t cg_draw3dIcons;
 vmCvar_t cg_drawIcons;
@@ -449,6 +453,7 @@ static cvarTable_t cvarTable[] = {	// bk001129
 	{&cg_drawStatus, "cg_drawStatus", "1", CVAR_ARCHIVE},
 	{&cg_drawTimer, "cg_drawTimer", "0", CVAR_ARCHIVE},
 	{&cg_drawFPS, "cg_drawFPS", "0", CVAR_ARCHIVE},
+	{&cg_drawPing, "cg_drawPing", "0", CVAR_ARCHIVE},
 	{&cg_drawSnapshot, "cg_drawSnapshot", "0", CVAR_ARCHIVE},
 	{&cg_draw3dIcons, "cg_draw3dIcons", "1", CVAR_ARCHIVE},
 	{&cg_drawIcons, "cg_drawIcons", "1", CVAR_ARCHIVE},