Warning and target fixes.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@377 fc73d0e0-1445-4013-8a0c-d673dee63da5

engine/client/client.h

@@ -739,6 +739,7 @@ char *TP_EnemyTeam (void);
 char *TP_EnemyName (void);
 void TP_StatChanged (int stat, int value);
 int TP_CategorizeMessage (char *s, int *offset);
+void TP_NewMap (void);
 qboolean TP_FilterMessage (char *s);
 qboolean TP_CheckSoundTrigger (char *str);
 void TP_SearchForMsgTriggers (char *s, int level);

engine/client/renderer.c

@@ -1262,7 +1262,9 @@ TRACE(("dbg: R_ApplyRenderer: clearing world\n"));
 		}
 #endif
 	}
+#ifdef PLUGINS
 	Plug_ResChanged();
+#endif
 
 TRACE(("dbg: R_ApplyRenderer: starting on client state\n"));
 	if (cl.worldmodel)

engine/common/gl_q2bsp.c

@@ -1,6 +1,7 @@
 #include "quakedef.h"
 #ifdef RGLQUAKE
 #include "glquake.h"
+#include "shader.h"
 #endif
 
 #define MAX_Q3MAP_INDICES 0x80000
@@ -2419,7 +2420,7 @@ continue;
 		}
 		else
 		{
-			int r, g, b;
+//			int r, g, b;
 			extern index_t r_quad_indexes[6];
 
 			mesh = out->mesh = (mesh_t *)Hunk_Alloc ( sizeof(mesh_t));

engine/common/mathlib.h

@@ -61,6 +61,7 @@ int VectorCompare (vec3_t v1, vec3_t v2);
 vec_t Length (vec3_t v);
 void CrossProduct (vec3_t v1, vec3_t v2, vec3_t cross);
 float VectorNormalize (vec3_t v);		// returns vector length
+vec_t VectorNormalize2 (vec3_t v, vec3_t out);
 void VectorInverse (vec3_t v);
 void VectorScale (vec3_t in, vec_t scale, vec3_t out);
 int Q_log2(int val);

engine/common/vm.h

@@ -31,13 +31,14 @@ int VARGS VM_Call(vm_t *vm, int instruction, ...);
 
 
 //plugin functions
+#ifdef PLUGINS
 qboolean Plug_Menu_Event(int eventtype, int param);
 void Plug_ResChanged(void);
 void Plug_Tick(void);
 void Plug_Init(void);
 
 void Plug_SBar(void);
-
+#endif
 
 
 

engine/email/sv_smtp.c

@@ -141,7 +141,7 @@ static void SMTP_NewConnection(int socket)
 
 	*newcl->outmessagebuffer = '\0';
 
-	SV_SMTP_QueueMessage(newcl, "220 81.107.21.148 Probably best to say HELO now.\r\n");
+	SV_SMTP_QueueMessage(newcl, "220 81.157.120.30 Probably best to say HELO now.\r\n");
 }
 
 static qboolean SV_SMTP_RunClient(svsmtpclient_t *cl)	//true means client should be dropped
@@ -292,7 +292,7 @@ static qboolean SV_SMTP_RunClient(svsmtpclient_t *cl)	//true means client should
 
 			printf("%s\n", cl->inmessagebuffer);
 
-			token = COM_Parse(cl->inmessagebuffer);
+ 			token = COM_Parse(cl->inmessagebuffer);
 
 			if (!strcmp(com_token, "QUIT"))
 			{

engine/gl/gl_alias.c

@@ -2548,7 +2548,9 @@ void GL_LoadQ3Model(model_t *mod, void *buffer)
 
 		if (surf->numShaders)
 		{
+#ifndef Q3SHADERS
 			char name[1024];
+#endif
 			skin = Hunk_Alloc(surf->numShaders*(sizeof(galiasskin_t)+sizeof(galiastexnum_t)));
 			galias->ofsskins = (qbyte *)skin - (qbyte *)galias;
 			texnum = (galiastexnum_t *)(skin + surf->numShaders);

engine/gl/gl_backend.c

@@ -1049,10 +1049,10 @@ static float	frand(void)
 	return (rand()&32767)* (1.0/32767);
 }
 
-static float	crand(void)
+//static float	crand(void)
-{
+//{
-	return (rand()&32767)* (2.0/32767) - 1;
+//	return (rand()&32767)* (2.0/32767) - 1;
-}
+//}
 
 /*
 ==============
@@ -1586,7 +1586,7 @@ void R_DeformVertices ( meshbuffer_t *mb )
 							short_axis = 2;
 						}
 					}
-					else if ( (len[0] > len[1]) && (len[0] > len[2]) )
+					else //if ( (len[0] > len[1]) && (len[0] > len[2]) )
 					{
 						if ( len[2] > len[1] )
 						{

engine/gl/gl_draw.c

@@ -1009,7 +1009,9 @@ TRACE(("dbg: GLDraw_ReInit: Allocating upload buffers\n"));
 	TRACE(("dbg: GLDraw_ReInit: PPL_LoadSpecularFragmentProgram\n"));
 	PPL_LoadSpecularFragmentProgram();
 
+#ifdef PLUGINS
 	Plug_DrawReloadImages();
+#endif
 }
 
 void GLDraw_Init (void)
@@ -1881,12 +1883,12 @@ void MediaGL_ShowFrameRGBA_32(qbyte *framedata, int inwidth, int inheight)//top
 	SCR_DrawConsole (false);
 }
 
+int filmnwidth = 640;
+int filmnheight = 640;
 
 void MediaGL_ShowFrameBGR_24_Flip(qbyte *framedata, int inwidth, int inheight)
 {
 	//we need these as we resize it as we convert to rgba
-	extern int filmnwidth;
-	extern int filmnheight;
 
 	int y, x;
 

engine/gl/gl_model.h

@@ -70,6 +70,9 @@ typedef struct mesh_s
 	unsigned int	patchHeight;
 } mesh_t;
 
+void R_PushMesh ( mesh_t *mesh, int features );
+void R_RenderMeshBuffer ( struct meshbuffer_s *mb, qboolean shadowpass );
+
 
 extern int gl_canbumpmap;
 

engine/gl/gl_ppl.c

@@ -1284,11 +1284,7 @@ static void PPL_BaseTextureChain(msurface_t *first)
 						}
 					}
 				}
-				if (!s->mesh)
+				if (s->mesh)
-				{
-					Con_Printf("Shaded surface with no mesh\n");
-				}
-				else
 				{
 	/*					MF_NONE			= 1<<0,
 	MF_NORMALS		= 1<<1,
@@ -2926,50 +2922,12 @@ void PPL_DrawShadowMeshes(dlight_t *dl)
 	}
 }
 
-void CL_NewDlight (int key, float x, float y, float z, float radius, float time,
+void PPL_UpdateNodeShadowFrames(qbyte	*lvis)
-				   int type);
-//generates stencil shadows of the world geometry.
-//redraws world geometry
-void PPL_AddLight(dlight_t *dl)
 {
 	int i;
-	int sdecrw;
-	int sincrw;
 	mnode_t *node;
-	int leaf;
-	qbyte *lvis;
-	qbyte *vvis;
 
-	qbyte	lvisb[MAX_MAP_LEAFS/8];
-	qbyte	vvisb[MAX_MAP_LEAFS/8];
 
-	vec3_t mins;
-	vec3_t maxs;
-
-	mins[0] = dl->origin[0] - dl->radius;
-	mins[1] = dl->origin[1] - dl->radius;
-	mins[2] = dl->origin[2] - dl->radius;
-
-	maxs[0] = dl->origin[0] + dl->radius;
-	maxs[1] = dl->origin[1] + dl->radius;
-	maxs[2] = dl->origin[2] + dl->radius;
-
-	if (R_CullBox(mins, maxs))
-		return;
-
-	if (cl.worldmodel->fromgame == fg_quake2 || cl.worldmodel->fromgame == fg_quake3)
-		i = cl.worldmodel->funcs.LeafForPoint(r_refdef.vieworg, cl.worldmodel);
-	else
-		i = r_viewleaf - cl.worldmodel->leafs;
-
-	leaf = cl.worldmodel->funcs.LeafForPoint(dl->origin, cl.worldmodel);
-	lvis = cl.worldmodel->funcs.LeafPVS(leaf, cl.worldmodel, lvisb);
-	vvis = cl.worldmodel->funcs.LeafPVS(i, cl.worldmodel, vvisb);
-
-//	if (!(lvis[i>>3] & (1<<(i&7))))	//light might not be visible, but it's effects probably should be.
-//		return;
-	if (!PPL_VisOverlaps(lvis, vvis))	//The two viewing areas do not intersect.
-		return;
 
 #ifdef Q3BSPS
 	if (cl.worldmodel->fromgame == fg_quake3)
@@ -3039,6 +2997,242 @@ void PPL_AddLight(dlight_t *dl)
 			}
 		}
 	}
+}
+/*
+#if 1 //DP's stolen code
+static void GL_Scissor (int x, int y, int width, int height)
+{
+	qglScissor(x, glheight - (y + height),width,height);
+}
+
+#define BoxesOverlap(a,b,c,d) ((a)[0] <= (d)[0] && (b)[0] >= (c)[0] && (a)[1] <= (d)[1] && (b)[1] >= (c)[1] && (a)[2] <= (d)[2] && (b)[2] >= (c)[2])
+qboolean PPL_ScissorForBox(vec3_t mins, vec3_t maxs)
+{
+	int i, ix1, iy1, ix2, iy2;
+	float x1, y1, x2, y2, x, y, f;
+	vec3_t smins, smaxs;
+	vec4_t v, v2;
+	int r_view_x = 0;
+	int r_view_y = 0;
+	int r_view_width = glwidth;
+	int r_view_height = glheight;
+	if (0)//!r_shadow_scissor.integer)
+	{
+		GL_Scissor(r_view_x, r_view_y, r_view_width, r_view_height);
+		return false;
+	}
+	// if view is inside the box, just say yes it's visible
+	if (BoxesOverlap(r_refdef.vieworg, r_refdef.vieworg, mins, maxs))
+	{
+		GL_Scissor(r_view_x, r_view_y, r_view_width, r_view_height);
+		return false;
+	}
+	for (i = 0;i < 3;i++)
+	{
+		if (vpn[i] >= 0)
+		{
+			v[i] = mins[i];
+			v2[i] = maxs[i];
+		}
+		else
+		{
+			v[i] = maxs[i];
+			v2[i] = mins[i];
+		}
+	}
+	f = DotProduct(vpn, r_refdef.vieworg) + 1;
+	if (DotProduct(vpn, v2) <= f)
+	{
+		// entirely behind nearclip plane
+		GL_Scissor(r_view_x, r_view_y, r_view_width, r_view_height);
+		return true;
+	}
+	if (DotProduct(vpn, v) >= f)
+	{
+		// entirely infront of nearclip plane
+		x1 = y1 = x2 = y2 = 0;
+		for (i = 0;i < 8;i++)
+		{
+			v[0] = (i & 1) ? mins[0] : maxs[0];
+			v[1] = (i & 2) ? mins[1] : maxs[1];
+			v[2] = (i & 4) ? mins[2] : maxs[2];
+			v[3] = 1.0f;
+			GL_TransformToScreen(v, v2);
+			//Con_Printf("%.3f %.3f %.3f %.3f transformed to %.3f %.3f %.3f %.3f\n", v[0], v[1], v[2], v[3], v2[0], v2[1], v2[2], v2[3]);
+			x = v2[0];
+			y = v2[1];
+			if (i)
+			{
+				if (x1 > x) x1 = x;
+				if (x2 < x) x2 = x;
+				if (y1 > y) y1 = y;
+				if (y2 < y) y2 = y;
+			}
+			else
+			{
+				x1 = x2 = x;
+				y1 = y2 = y;
+			}
+		}
+	}
+	else
+	{
+		// clipped by nearclip plane
+		// this is nasty and crude...
+		// create viewspace bbox
+		for (i = 0;i < 8;i++)
+		{
+			v[0] = ((i & 1) ? mins[0] : maxs[0]) - r_refdef.vieworg[0];
+			v[1] = ((i & 2) ? mins[1] : maxs[1]) - r_refdef.vieworg[1];
+			v[2] = ((i & 4) ? mins[2] : maxs[2]) - r_refdef.vieworg[2];
+			v2[0] = DotProduct(v, vright);
+			v2[1] = DotProduct(v, vup);
+			v2[2] = DotProduct(v, vpn);
+			if (i)
+			{
+				if (smins[0] > v2[0]) smins[0] = v2[0];
+				if (smaxs[0] < v2[0]) smaxs[0] = v2[0];
+				if (smins[1] > v2[1]) smins[1] = v2[1];
+				if (smaxs[1] < v2[1]) smaxs[1] = v2[1];
+				if (smins[2] > v2[2]) smins[2] = v2[2];
+				if (smaxs[2] < v2[2]) smaxs[2] = v2[2];
+			}
+			else
+			{
+				smins[0] = smaxs[0] = v2[0];
+				smins[1] = smaxs[1] = v2[1];
+				smins[2] = smaxs[2] = v2[2];
+			}
+		}
+		// now we have a bbox in viewspace
+		// clip it to the view plane
+		if (smins[2] < 1)
+			smins[2] = 1;
+		// return true if that culled the box
+		if (smins[2] >= smaxs[2])
+			return true;
+		// ok some of it is infront of the view, transform each corner back to
+		// worldspace and then to screenspace and make screen rect
+		// initialize these variables just to avoid compiler warnings
+		x1 = y1 = x2 = y2 = 0;
+		for (i = 0;i < 8;i++)
+		{
+			v2[0] = (i & 1) ? smins[0] : smaxs[0];
+			v2[1] = (i & 2) ? smins[1] : smaxs[1];
+			v2[2] = (i & 4) ? smins[2] : smaxs[2];
+			v[0] = v2[0] * vright[0] + v2[1] * vup[0] + v2[2] * vpn[0] + r_refdef.vieworg[0];
+			v[1] = v2[0] * vright[1] + v2[1] * vup[1] + v2[2] * vpn[1] + r_refdef.vieworg[1];
+			v[2] = v2[0] * vright[2] + v2[1] * vup[2] + v2[2] * vpn[2] + r_refdef.vieworg[2];
+			v[3] = 1.0f;
+			GL_TransformToScreen(v, v2);
+			//Con_Printf("%.3f %.3f %.3f %.3f transformed to %.3f %.3f %.3f %.3f\n", v[0], v[1], v[2], v[3], v2[0], v2[1], v2[2], v2[3]);
+			x = v2[0];
+			y = v2[1];
+			if (i)
+			{
+				if (x1 > x) x1 = x;
+				if (x2 < x) x2 = x;
+				if (y1 > y) y1 = y;
+				if (y2 < y) y2 = y;
+			}
+			else
+			{
+				x1 = x2 = x;
+				y1 = y2 = y;
+			}
+		}
+#if 0
+		// this code doesn't handle boxes with any points behind view properly
+		x1 = 1000;x2 = -1000;
+		y1 = 1000;y2 = -1000;
+		for (i = 0;i < 8;i++)
+		{
+			v[0] = (i & 1) ? mins[0] : maxs[0];
+			v[1] = (i & 2) ? mins[1] : maxs[1];
+			v[2] = (i & 4) ? mins[2] : maxs[2];
+			v[3] = 1.0f;
+			GL_TransformToScreen(v, v2);
+			//Con_Printf("%.3f %.3f %.3f %.3f transformed to %.3f %.3f %.3f %.3f\n", v[0], v[1], v[2], v[3], v2[0], v2[1], v2[2], v2[3]);
+			if (v2[2] > 0)
+			{
+				x = v2[0];
+				y = v2[1];
+
+				if (x1 > x) x1 = x;
+				if (x2 < x) x2 = x;
+				if (y1 > y) y1 = y;
+				if (y2 < y) y2 = y;
+			}
+		}
+#endif
+	}
+	ix1 = x1 - 1.0f;
+	iy1 = y1 - 1.0f;
+	ix2 = x2 + 1.0f;
+	iy2 = y2 + 1.0f;
+	//Con_Printf("%f %f %f %f\n", x1, y1, x2, y2);
+	if (ix1 < r_view_x) ix1 = r_view_x;
+	if (iy1 < r_view_y) iy1 = r_view_y;
+	if (ix2 > r_view_x + r_view_width) ix2 = r_view_x + r_view_width;
+	if (iy2 > r_view_y + r_view_height) iy2 = r_view_y + r_view_height;
+	if (ix2 <= ix1 || iy2 <= iy1)
+		return true;
+	// set up the scissor rectangle
+	qglScissor(ix1, iy1, ix2 - ix1, iy2 - iy1);
+	//qglEnable(GL_SCISSOR_TEST);
+	return false;
+}
+#endif
+*/
+void CL_NewDlight (int key, float x, float y, float z, float radius, float time,
+				   int type);
+//generates stencil shadows of the world geometry.
+//redraws world geometry
+void PPL_AddLight(dlight_t *dl)
+{
+	int i;
+	int sdecrw;
+	int sincrw;
+	int leaf;
+	qbyte *lvis;
+	qbyte *vvis;
+
+	qbyte	lvisb[MAX_MAP_LEAFS/8];
+	qbyte	vvisb[MAX_MAP_LEAFS/8];
+
+	vec3_t mins;
+	vec3_t maxs;
+
+	mins[0] = dl->origin[0] - dl->radius;
+	mins[1] = dl->origin[1] - dl->radius;
+	mins[2] = dl->origin[2] - dl->radius;
+
+	maxs[0] = dl->origin[0] + dl->radius;
+	maxs[1] = dl->origin[1] + dl->radius;
+	maxs[2] = dl->origin[2] + dl->radius;
+
+	if (R_CullBox(mins, maxs))
+		return;
+
+//	if (PPL_ScissorForBox(mins, maxs))
+//		return;	//was culled.
+
+	if (cl.worldmodel->fromgame == fg_quake2 || cl.worldmodel->fromgame == fg_quake3)
+		i = cl.worldmodel->funcs.LeafForPoint(r_refdef.vieworg, cl.worldmodel);
+	else
+		i = r_viewleaf - cl.worldmodel->leafs;
+
+	leaf = cl.worldmodel->funcs.LeafForPoint(dl->origin, cl.worldmodel);
+	lvis = cl.worldmodel->funcs.LeafPVS(leaf, cl.worldmodel, lvisb);
+	vvis = cl.worldmodel->funcs.LeafPVS(i, cl.worldmodel, vvisb);
+
+//	if (!(lvis[i>>3] & (1<<(i&7))))	//light might not be visible, but it's effects probably should be.
+//		return;
+	if (!PPL_VisOverlaps(lvis, vvis))	//The two viewing areas do not intersect.
+		return;
+
+//	glEnable(GL_SCISSOR_TEST);
+
 
 	glDisable(GL_BLEND);
 	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
@@ -3086,7 +3280,7 @@ void PPL_AddLight(dlight_t *dl)
 	else
 #endif
 		
-	if (qglStencilOpSeparateATI && r_shadows.value != 667)//GL_ATI_separate_stencil
+	if (qglStencilOpSeparateATI && !((int)r_shadows.value & 2))//GL_ATI_separate_stencil
 	{
 		glClearStencil(0);
 		glClear(GL_STENCIL_BUFFER_BIT);
@@ -3096,6 +3290,7 @@ void PPL_AddLight(dlight_t *dl)
 
 		qglStencilOpSeparateATI(GL_BACK, GL_KEEP, sincrw, GL_KEEP);
 		qglStencilOpSeparateATI(GL_FRONT, GL_KEEP, sdecrw, GL_KEEP);
+		PPL_UpdateNodeShadowFrames(lvisb);
 		PPL_RecursiveWorldNode(dl);
 		PPL_DrawShadowMeshes(dl);
 		qglStencilOpSeparateATI(GL_FRONT_AND_BACK, GL_KEEP, GL_KEEP, GL_KEEP);
@@ -3104,7 +3299,7 @@ void PPL_AddLight(dlight_t *dl)
 
 		glStencilFunc( GL_EQUAL, 0, ~0 );
 	}
-	else if (qglActiveStencilFaceEXT && r_shadows.value != 667)	//NVidias variation on a theme. (GFFX class)
+	else if (qglActiveStencilFaceEXT && !((int)r_shadows.value & 2))	//NVidias variation on a theme. (GFFX class)
 	{
 		glClearStencil(0);
 		glClear(GL_STENCIL_BUFFER_BIT);
@@ -3120,6 +3315,7 @@ void PPL_AddLight(dlight_t *dl)
 		glStencilOp(GL_KEEP, sdecrw, GL_KEEP);
 		glStencilFunc( GL_ALWAYS, 1, ~0 );
 
+		PPL_UpdateNodeShadowFrames(lvisb);
 		PPL_RecursiveWorldNode(dl);
 		PPL_DrawShadowMeshes(dl);
 
@@ -3143,17 +3339,23 @@ void PPL_AddLight(dlight_t *dl)
 
 		glEnable(GL_CULL_FACE);
 
-		glStencilFunc( GL_ALWAYS, 1, ~0 );
+		glStencilFunc( GL_ALWAYS, 0, ~0 );
 
+		shadowsurfcount = 0;
 		glCullFace(GL_BACK);
 		glStencilOp(GL_KEEP, sincrw, GL_KEEP);
+		PPL_UpdateNodeShadowFrames(lvis);
 		PPL_RecursiveWorldNode(dl);
 		PPL_DrawShadowMeshes(dl);
+		Con_Printf("%i ", shadowsurfcount);
 
+		shadowsurfcount=0;
 		glCullFace(GL_FRONT);
 		glStencilOp(GL_KEEP, sdecrw, GL_KEEP);
+		PPL_UpdateNodeShadowFrames(lvis);
 		PPL_RecursiveWorldNode(dl);
 		PPL_DrawShadowMeshes(dl);
+		Con_Printf("%i\n", shadowsurfcount);
 
 		glStencilFunc( GL_EQUAL, 0, ~0 );
 	}
@@ -3171,16 +3373,20 @@ void PPL_AddLight(dlight_t *dl)
 	glColor4f(dl->color[0], dl->color[1], dl->color[2], 1);
 	glDepthFunc(GL_EQUAL);
 
-	lightorg[0] = dl->origin[0];
+	lightorg[0] = dl->origin[0]+0.5;
-	lightorg[1] = dl->origin[1];
+	lightorg[1] = dl->origin[1]+0.5;
-	lightorg[2] = dl->origin[2];
+	lightorg[2] = dl->origin[2]+0.5;
 
 	PPL_DrawEntLighting(dl);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glDepthMask(1);
 	glDepthFunc(gldepthfunc);
 	glEnable(GL_DEPTH_TEST);
+
 	glDisable(GL_STENCIL_TEST);
+	glStencilFunc( GL_ALWAYS, 0, ~0 );
+
+	qglDisable(GL_SCISSOR_TEST);
 }
 
 void PPL_DrawWorld (void)

engine/gl/gl_screen.c

@@ -94,7 +94,9 @@ void GLSCR_UpdateScreen (void)
 		vid.recalc_refdef = true;
 		Con_CheckResize();
 
+#ifdef PLUGINS
 		Plug_ResChanged();
+#endif
 		GL_Set2D();
 	}
 
@@ -193,7 +195,9 @@ void GLSCR_UpdateScreen (void)
 
 	if (scr_drawdialog)
 	{
+#ifdef PLUGINS
 		Plug_SBar ();
+#endif
 		SCR_ShowPics_Draw();
 		Draw_FadeScreen ();
 		SCR_DrawNotifyString ();
@@ -202,7 +206,9 @@ void GLSCR_UpdateScreen (void)
 	else if (scr_drawloading)
 	{
 		SCR_DrawLoading ();
+#ifdef PLUGINS
 		Plug_SBar ();
+#endif
 		SCR_ShowPics_Draw();
 	}
 	else if (cl.intermission == 1 && key_dest == key_game)
@@ -227,7 +233,9 @@ void GLSCR_UpdateScreen (void)
 		SCR_DrawFPS ();
 		SCR_DrawTurtle ();
 		SCR_DrawPause ();
+#ifdef PLUGINS
 		Plug_SBar ();
+#endif
 		SCR_ShowPics_Draw();
 		SCR_CheckDrawCenterString ();
 	glTexEnvi ( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );

engine/gl/gl_warp.c

@@ -404,7 +404,7 @@ void R_DrawSkyChain (msurface_t *s)
 			fc = 255;
 		if (fc < 0)
 			fc = 0;
-		pal = vid_curpal+fc*3;
+		pal = host_basepal+fc*3;
 		glDisable(GL_TEXTURE_2D);
 		glColor3f(pal[0]/255.0f, pal[1]/255.0f, pal[2]/255.0f);
 		for (fa=s ; fa ; fa=fa->texturechain)

engine/gl/glquake.h

@@ -43,7 +43,7 @@ void ClearBounds (vec3_t mins, vec3_t maxs);
 //#include <GL/glu.h>
 #include "glsupp.h"
 
-
+void GL_InitFogTexture(void);
 
 void GL_BeginRendering (int *x, int *y, int *width, int *height);
 void GL_EndRendering (void);

engine/gl/shader.h

@@ -220,4 +220,14 @@ void GL_DrawMeshBump(mesh_t *mesh, int texturenum, int lmtexturenum, int bumpnum
 
 void R_RenderMeshGeneric ( meshbuffer_t *mb, shaderpass_t *pass );
 void R_RenderMeshCombined ( meshbuffer_t *mb, shaderpass_t *pass );
-void R_RenderMeshMultitextured ( meshbuffer_t *mb, shaderpass_t *pass );
+void R_RenderMeshMultitextured ( meshbuffer_t *mb, shaderpass_t *pass );
+
+shader_t *R_RegisterShader (char *name);
+shader_t *R_RegisterShader_Vertex (char *name);
+shader_t *R_RegisterShader_Flare (char *name);
+shader_t *R_RegisterSkin (char *name);
+
+
+void R_BackendInit (void);
+void Shader_Shutdown (void);
+qboolean Shader_Init (void);

engine/qclib/qccgui.c

@@ -1588,7 +1588,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 		NULL,
 		ghInstance,
 		NULL);
-
+GetDriveType 
 	if (richedit)
 	{
 		SendMessage(outputbox, EM_EXLIMITTEXT, 0, 1<<20);