From: lordhavoc <lordhavoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 30 Apr 2002 06:03:29 +0000 (+0000)
Subject: no longer uses glColor3f at all
X-Git-Tag: RELEASE_0_2_0_RC1~527
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fc117f42d5cd245a7a50eba5f566fb8cf4093671;p=xonotic%2Fdarkplaces.git

no longer uses glColor3f at all


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

diff --git a/gl_draw.c b/gl_draw.c
index f5cb2bb2..330b13e9 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -505,10 +505,10 @@ void R_DrawQueue(void)
 			glBegin (GL_TRIANGLES);
 			while (t >= 1.01f)
 			{
-				if (t >= 2)
-					glColor3f (1, 1, 1);
-				else
-					glColor3f (t-1, t-1, t-1);
+				num = (int) ((t - 1.0f) * 255.0f);
+				if (num > 255)
+					num = 255;
+				glColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255);
 				glVertex2f (-5000, -5000);
 				glVertex2f (10000, -5000);
 				glVertex2f (-5000, 10000);
@@ -522,10 +522,11 @@ void R_DrawQueue(void)
 			glBlendFunc(GL_ZERO, GL_SRC_COLOR);
 			CHECKGLERROR
 			glBegin(GL_TRIANGLES);
-			glColor3f(t, t, t);
-			glVertex2f(-5000, -5000);
-			glVertex2f(10000, -5000);
-			glVertex2f(-5000, 10000);
+			num = (int) (t * 255.0f);
+			glColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255);
+			glVertex2f (-5000, -5000);
+			glVertex2f (10000, -5000);
+			glVertex2f (-5000, 10000);
 			glEnd();
 			CHECKGLERROR
 		}
@@ -533,7 +534,8 @@ void R_DrawQueue(void)
 		{
 			glBlendFunc (GL_ONE, GL_ONE);
 			CHECKGLERROR
-			glColor3f (v_brightness.value, v_brightness.value, v_brightness.value);
+			num = (int) (v_brightness.value * 255.0f);
+			glColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255);
 			CHECKGLERROR
 			glBegin (GL_TRIANGLES);
 			glVertex2f (-5000, -5000);
@@ -552,8 +554,8 @@ void R_DrawQueue(void)
 	CHECKGLERROR
 	glEnable (GL_DEPTH_TEST);
 	CHECKGLERROR
-	glDisable(GL_BLEND);
+	glDisable (GL_BLEND);
 	CHECKGLERROR
-	glColor3f(1,1,1);
+	glColor4ub (255, 255, 255, 255);
 	CHECKGLERROR
 }