From 78e798722bcbfde3437dc664f76a5b06b3e33afd Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Thu, 13 Jan 2005 17:59:57 +0000
Subject: [PATCH] Fixed application of crosshairalpha, it's now all applied
properly.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@778 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
engine/gl/gl_draw.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/engine/gl/gl_draw.c b/engine/gl/gl_draw.c
index 9b3131d59..093c0f368 100644
--- a/engine/gl/gl_draw.c
+++ b/engine/gl/gl_draw.c
@@ -1269,7 +1269,6 @@ void GLDraw_Crosshair(void)
return;
}
GL_TexEnv(GL_MODULATE);
- qglColor4f(1, 1, 1, crosshairalpha.value);
if (*crosshairimage.string)
{
@@ -1338,6 +1337,8 @@ void GLDraw_Crosshair(void)
else
return;
+ qglColor4f(1, 1, 1, crosshairalpha.value);
+
for (sc = 0; sc < cl.splitclients; sc++)
{
SCR_CrosshairPosition(sc, &x, &y);
@@ -1361,6 +1362,8 @@ void GLDraw_Crosshair(void)
// GL_TexEnv ( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );
// GL_TexEnv ( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
+
+ qglColor4f(1, 1, 1, 1);
}