From 3d861b61e340c74b21075d19227323add3ba6dff Mon Sep 17 00:00:00 2001 From: TimeServ Date: Thu, 20 Oct 2005 04:32:51 +0000 Subject: [PATCH] fix to gl crosshair git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1514 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/gl/gl_draw.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/gl/gl_draw.c b/engine/gl/gl_draw.c index e7723f464..125633801 100644 --- a/engine/gl/gl_draw.c +++ b/engine/gl/gl_draw.c @@ -1307,7 +1307,10 @@ void GLDraw_Crosshair(void) } GL_TexEnv(GL_MODULATE); - chrebuild = chmodified != crosshaircolor.modified || crosshairimage.modified || crosshair.modified || crosshair.value >= FIRSTANIMATEDCROSHAIR; + chrebuild = chmodified != crosshaircolor.modified || + crosshair.modified || + (*crosshairimage.string && crosshairimage.modified) || + crosshair.value >= FIRSTANIMATEDCROSHAIR; if (chrebuild) { @@ -1343,7 +1346,7 @@ void GLDraw_Crosshair(void) } // i contains the crosshair color c2 = c; - VectorScale(chcolor, 1/255, chcolor); // scale 0-255 to 0-1 range + VectorScale(chcolor, 1/255.0, chcolor); // scale 0-255 to 0-1 range chmodified = crosshaircolor.modified; }