Can safely be performed in place.
==================
*/
-static void W_CleanupName (char *in, char *out)
+static void W_CleanupName (const char *in, char *out)
{
int i;
int c;
out[i] = 0;
}
-void *W_GetLumpName(char *name)
+void *W_GetLumpName(const char *name)
{
int i;
lumpinfo_t *lump;
static int wad_numlumps = 0;
static lumpinfo_t *wad_lumps = NULL;
static qbyte *wad_base = NULL;
- static mempool_t *wad_mempool = NULL;
W_CleanupName (name, clean);
Con_Print("gfx.wad doesn't have WAD2 id\n");
else
{
- wad_mempool = Mem_AllocPool("gfx.wad", 0, NULL);
- wad_base = Mem_Alloc(wad_mempool, fs_filesize);
+ wad_base = Mem_Alloc(cl_mempool, fs_filesize);
memcpy(wad_base, temp, fs_filesize);
Mem_Free(temp);
qfile_t *file;
int numlumps;
- file = FS_Open (filename, "rb", false);
+ file = FS_Open (filename, "rb", false, false);
if (!file)
{
if (complain)
if (!(lumps = Mem_Alloc(tempmempool, sizeof(lumpinfo_t)*numlumps)))
{Con_Print("W_LoadTextureWadFile: unable to allocate temporary memory for lump table\n");return;}
- if (FS_Read(file, lumps, sizeof(lumpinfo_t) * numlumps) != sizeof(lumpinfo_t) * (size_t)numlumps)
+ if (FS_Read(file, lumps, sizeof(lumpinfo_t) * numlumps) != (fs_offset_t)sizeof(lumpinfo_t) * numlumps)
{Con_Print("W_LoadTextureWadFile: unable to read lump table\n");return;}
for (i=0, lump_p = lumps ; i<numlumps ; i++,lump_p++)
tex = Mem_Alloc(tempmempool, texwadlump[i].size);
if (!tex)
return NULL;
- if (FS_Read(file, tex, texwadlump[i].size) < (size_t)texwadlump[i].size)
+ if (FS_Read(file, tex, texwadlump[i].size) < texwadlump[i].size)
{Con_Print("W_GetTexture: corrupt WAD3 file\n");return NULL;}
tex->width = LittleLong(tex->width);