diff options
Diffstat (limited to 'src/r_data.c')
| -rw-r--r-- | src/r_data.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/r_data.c b/src/r_data.c index 8558a1ef..98d49aac 100644 --- a/src/r_data.c +++ b/src/r_data.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: r_data.c 36 2005-08-04 18:40:22Z fraggle $ +// $Id: r_data.c 120 2005-09-22 13:13:47Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -22,6 +22,11 @@ // 02111-1307, USA. // // $Log$ +// Revision 1.7 2005/09/22 13:13:47 fraggle +// Remove external statistics driver support (-statcopy): +// nonfunctional on modern systems and never used. +// Fix for systems where sizeof(int) != sizeof(void *) +// // Revision 1.6 2005/08/04 18:40:22 fraggle // Use zone memory functions instead of alloca/malloc/free // @@ -50,7 +55,7 @@ static const char -rcsid[] = "$Id: r_data.c 36 2005-08-04 18:40:22Z fraggle $"; +rcsid[] = "$Id: r_data.c 120 2005-09-22 13:13:47Z fraggle $"; #include "i_system.h" #include "z_zone.h" @@ -662,10 +667,8 @@ void R_InitColormaps (void) // Load in the light tables, // 256 byte align tables. lump = W_GetNumForName("COLORMAP"); - length = W_LumpLength (lump) + 255; - colormaps = Z_Malloc (length, PU_STATIC, 0); - colormaps = (byte *)( ((int)colormaps + 255)&~0xff); - W_ReadLump (lump,colormaps); + length = W_LumpLength (lump); + colormaps = W_CacheLumpNum(lump, PU_STATIC); } |