mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2025-01-31 12:40:56 +00:00
Some changes to quakefs.c for the pakzip (formerly pak3) support.
Found and deleted unused, obsolete functions in r_surf.c
This commit is contained in:
parent
6d8a39b2dd
commit
17eb4d012c
2 changed files with 1 additions and 92 deletions
|
@ -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
|
||||
|
|
|
@ -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");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue