From 17eb4d012c155fb4251114159c254978de7d358d Mon Sep 17 00:00:00 2001
From: Eric Windisch <windisch@nni.com>
Date: Mon, 14 Feb 2000 03:08:14 +0000
Subject: [PATCH] Some changes to quakefs.c for the pakzip (formerly pak3)
 support. Found and deleted unused, obsolete functions in r_surf.c

---
 common/quakefs.c |  2 +-
 common/r_surf.c  | 91 ------------------------------------------------
 2 files changed, 1 insertion(+), 92 deletions(-)

diff --git a/common/quakefs.c b/common/quakefs.c
index bb77196..f9f9508 100644
--- a/common/quakefs.c
+++ b/common/quakefs.c
@@ -667,7 +667,7 @@ pack_t *COM_LoadPackZipFile (char *packfile)
 	
 	Con_Printf ("Added packfile %s (%.0f files)\n", packfile, numpackfiles);
 
-	COM_pak3_close(pak);
+	COM_pakzip_close(pak);
 	return pack_old;
 }
 #endif 
diff --git a/common/r_surf.c b/common/r_surf.c
index 9602c70..bbc0d7e 100644
--- a/common/r_surf.c
+++ b/common/r_surf.c
@@ -590,94 +590,3 @@ void R_DrawSurfaceBlock16 (void)
 #endif
 
 
-//============================================================================
-
-/*
-================
-R_GenTurbTile
-================
-*/
-void R_GenTurbTile (pixel_t *pbasetex, void *pdest)
-{
-	int		*turb;
-	int		i, j, s, t;
-	byte	*pd;
-	
-	turb = sintable + ((int)(cl.time*SPEED)&(CYCLE-1));
-	pd = (byte *)pdest;
-
-	for (i=0 ; i<TILE_SIZE ; i++)
-	{
-		for (j=0 ; j<TILE_SIZE ; j++)
-		{	
-			s = (((j << 16) + turb[i & (CYCLE-1)]) >> 16) & 63;
-			t = (((i << 16) + turb[j & (CYCLE-1)]) >> 16) & 63;
-			*pd++ = *(pbasetex + (t<<6) + s);
-		}
-	}
-}
-
-
-/*
-================
-R_GenTurbTile16
-================
-*/
-void R_GenTurbTile16 (pixel_t *pbasetex, void *pdest)
-{
-	int				*turb;
-	int				i, j, s, t;
-	unsigned short	*pd;
-
-	turb = sintable + ((int)(cl.time*SPEED)&(CYCLE-1));
-	pd = (unsigned short *)pdest;
-
-	for (i=0 ; i<TILE_SIZE ; i++)
-	{
-		for (j=0 ; j<TILE_SIZE ; j++)
-		{	
-			s = (((j << 16) + turb[i & (CYCLE-1)]) >> 16) & 63;
-			t = (((i << 16) + turb[j & (CYCLE-1)]) >> 16) & 63;
-			*pd++ = d_8to16table[*(pbasetex + (t<<6) + s)];
-		}
-	}
-}
-
-
-/*
-================
-R_GenTile
-================
-*/
-void R_GenTile (msurface_t *psurf, void *pdest)
-{
-	if (psurf->flags & SURF_DRAWTURB)
-	{
-		if (r_pixbytes == 1)
-		{
-			R_GenTurbTile ((pixel_t *)
-				((byte *)psurf->texinfo->texture + psurf->texinfo->texture->offsets[0]), pdest);
-		}
-		else
-		{
-			R_GenTurbTile16 ((pixel_t *)
-				((byte *)psurf->texinfo->texture + psurf->texinfo->texture->offsets[0]), pdest);
-		}
-	}
-	else if (psurf->flags & SURF_DRAWSKY)
-	{
-		if (r_pixbytes == 1)
-		{
-			R_GenSkyTile (pdest);
-		}
-		else
-		{
-			R_GenSkyTile16 (pdest);
-		}
-	}
-	else
-	{
-		Sys_Error ("Unknown tile type");
-	}
-}
-