From 16c66488e903bf552199e634822a0b5ba6bf3e8a Mon Sep 17 00:00:00 2001
From: Ragnvald Maartmann-Moe IV <despair@users.sourceforge.net>
Date: Sat, 27 Jan 2001 07:23:39 +0000
Subject: [PATCH] Fix blurred cursor when picmip, and a minor include cleanup.

---
 source/gl_draw.c  | 25 +++++++++++++++----------
 source/gl_rmain.c |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/source/gl_draw.c b/source/gl_draw.c
index 8e91c0a..b895337 100644
--- a/source/gl_draw.c
+++ b/source/gl_draw.c
@@ -29,12 +29,14 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <string.h>
-#include <stdio.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include <stdio.h>
 
 #include "cmd.h"
 #include "console.h"
@@ -476,11 +478,14 @@ Draw_Init (void)
 	cs_texture = GL_LoadTexture ("crosshair", 8, 8, cs_data, false, true, 1);
 //  char_texture = GL_LoadTexture ("charset", 128, 128, draw_chars, false, true, 1);    // 1999-12-27 Conwidth/height charset fix by TcT
 
-//	glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-//	glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); // DESPAIR: If trilinear, crosshairs are blocks of solid color
-	glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
+	if (gl_picmip)
+	{
+		glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	} else {
+		glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	}
 	// save a texture slot for translated picture
 	translate_texture = texture_extension_number++;
 
diff --git a/source/gl_rmain.c b/source/gl_rmain.c
index ce81c7c..e4069d1 100644
--- a/source/gl_rmain.c
+++ b/source/gl_rmain.c
@@ -884,7 +884,7 @@ R_DrawAliasModel (entity_t *e)
 	}
 
 	if (gl_affinemodels->int_val)
-		glHint (GL_PERSPECTIVE_CORRECTION_HINT, GL_DONT_CARE); // DESPAIR: was GL_FASTEST
+		glHint (GL_PERSPECTIVE_CORRECTION_HINT, GL_DONT_CARE);
 
 	glPopMatrix ();