Repaired UQuake gl_rmail.c mess, commented out gl_reporttjunctions refs,

since they are apparently unused by either QW or UQuake.

common/gl_rmain.c

@@ -102,7 +102,7 @@ cvar_t	gl_playermip = {"gl_playermip","0"};
 cvar_t	gl_nocolors = {"gl_nocolors","0"};
 #ifdef QUAKEWORLD
 cvar_t	gl_keeptjunctions = {"gl_keeptjunctions","1"};
-cvar_t	gl_reporttjunctions = {"gl_reporttjunctions","0"};
+//cvar_t	gl_reporttjunctions = {"gl_reporttjunctions","0"};
 #else
 cvar_t	gl_keeptjunctions = {"gl_keeptjunctions","0"};
 cvar_t	gl_doubleeyes = {"gl_doubleeys", "1"};
@@ -511,7 +511,8 @@ void R_DrawAliasModel (entity_t *e)
 	if (!strcmp(clmodel->name, "progs/player.mdl")) {
 #else
 	i = currententity - cl_entities;
-	if (i >= 1 && i<=cl.maxclients /* && !strcmp (currententity->model->name, "progs/player.mdl") */)
+//	if (i >= 1 && i <= cl.maxclients && !strcmp (currententity->model->name, "progs/player.mdl")) {
+	if (i >= 1 && i <= cl.maxclients) {
 #endif
 		if (ambientlight < 8)
 			ambientlight = shadelight = 8;
@@ -549,7 +550,7 @@ void R_DrawAliasModel (entity_t *e)
 #ifdef QUAKEWORLD
 	if (!strcmp (clmodel->name, "progs/eyes.mdl") ) {
 #else
-	if (!strcmp (clmodel->name, "progs/eyes.mdl" && gl_doubleeyes.value) ) {
+	if (!strcmp (clmodel->name, "progs/eyes.mdl") && gl_doubleeyes.value) {
 #endif
 		glTranslatef (paliashdr->scale_origin[0], paliashdr->scale_origin[1], paliashdr->scale_origin[2] - (22 + 8));
 		// double size of eyes, since they are really hard to see in gl

common/glquake2.h

@@ -199,7 +199,7 @@ extern	cvar_t	gl_affinemodels;
 extern	cvar_t	gl_fogblend;
 extern	cvar_t	gl_polyblend;
 extern	cvar_t	gl_keeptjunctions;
-extern	cvar_t	gl_reporttjunctions;
+//extern	cvar_t	gl_reporttjunctions;
 
 extern	int		gl_lightmap_format;
 extern	int		gl_solid_format;

qw_client/gl_rmisc.c

@@ -202,7 +202,7 @@ void R_Init (void)
 	Cvar_RegisterVariable (&gl_finish);
 
 	Cvar_RegisterVariable (&gl_keeptjunctions);
-	Cvar_RegisterVariable (&gl_reporttjunctions);
+//	Cvar_RegisterVariable (&gl_reporttjunctions);
 
 	R_InitBubble();
 	

qw_client/glquake.h

@@ -33,31 +33,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 void GL_BeginRendering (int *x, int *y, int *width, int *height);
 void GL_EndRendering (void);
 
-/* palisade -	i didn't add loring's 1999/12/30 patch directly, i edited it
-		by hand because he was behind on the updates...
-		it looks like he might have fudged the following, so i'm
-		not including it... here's what his "new" code looks like:
-
--#ifndef APIENTRY
-- Mesa defines APIENTRY, but other versions of OpenGL do not 
--#ifdef GLAPIENTRY
--#define APIENTRY GLAPIENTRY
--#else
--#define APIENTRY
--#endif
--#endif
-
-	note: the rest of his patch is further down /loring
-*/
 	/* Mesa pre-3.1 defines APIENTRY instead of GLAPIENTRY */
 #ifndef GLAPIENTRY
-#ifdef APIENTRY
+#	ifdef APIENTRY
 	/* Create compatible GLAPIENTRY definition from APIENTRY */
-#define GLAPIENTRY APIENTRY
+#		define GLAPIENTRY APIENTRY
-#else
+#	else
-	/* Error out -- it's pathological and we don't know what to do */
+#		define GLAPIENTRY
-#error "I don't know what data type GLAPIENTRY is on this system."
+#	endif
-#endif
 #endif
 
 /*	continuation of loring's patch, he just #ifdef'd and #endif'd _WIN32

uquake/gl_rmisc.c

@@ -206,7 +206,7 @@ void R_Init (void)
 	Cvar_RegisterVariable (&gl_nocolors);
 
 	Cvar_RegisterVariable (&gl_keeptjunctions);
-	Cvar_RegisterVariable (&gl_reporttjunctions);
+//	Cvar_RegisterVariable (&gl_reporttjunctions);
 
 	Cvar_RegisterVariable (&gl_doubleeyes);
 

uquake/glquake.h

@@ -35,6 +35,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 void GL_BeginRendering (int *x, int *y, int *width, int *height);
 void GL_EndRendering (void);
 
+	/* Mesa pre-3.1 defines APIENTRY instead of GLAPIENTRY */
+#ifndef GLAPIENTRY
+#	ifdef APIENTRY
+	/* Create compatible GLAPIENTRY definition from APIENTRY */
+#		define GLAPIENTRY APIENTRY
+#	else
+#		define GLAPIENTRY
+#	endif
+#endif
 
 #ifdef _WIN32
 // Function prototypes for the Texture Object Extension routines
@@ -240,10 +249,6 @@ void GL_Bind (int texnum);
 #define    TEXTURE0_SGIS				0x835E
 #define    TEXTURE1_SGIS				0x835F
 
-#ifndef _WIN32
-#define GLAPIENTRY /* */
-#endif
-
 typedef void (GLAPIENTRY *lpMTexFUNC) (GLenum, GLfloat, GLfloat);
 typedef void (GLAPIENTRY *lpSelTexFUNC) (GLenum);
 extern lpMTexFUNC qglMTexCoord2fSGIS;