Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-// wad.c
+
#include "quakedef.h"
+#include "image.h"
+#include "wad.h"
+
void SwapPic (qpic_t *pic);
+
/*
==================
W_CleanupName
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)
qbyte *in, *data, *out, *pal;
int d, p;
- in = (qbyte *)((int) tex + tex->offsets[0]);
+ in = (qbyte *)tex + tex->offsets[0];
data = out = Mem_Alloc(tempmempool, tex->width * tex->height * 4);
if (!data)
return NULL;