X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=wad.c;h=7d488dbd961359f8b10733fa7ba20c7680c88c4e;hb=af9b88529d08cdf7a5466c98edc20a0b0b19e72f;hp=b0ea75f15b302bdf61e0402650215ad356b84dd0;hpb=3a16e432521bf1f1bb796a76c3819a5334b59b9b;p=xonotic%2Fdarkplaces.git

diff --git a/wad.c b/wad.c
index b0ea75f1..7d488dbd 100644
--- a/wad.c
+++ b/wad.c
@@ -61,32 +61,31 @@ static void W_CleanupName (const char *in, char *out)
 void *W_GetLumpName(const char *name)
 {
 	int i;
+	fs_offset_t filesize;
 	lumpinfo_t *lump;
 	char clean[16];
 	wadinfo_t *header;
 	int infotableofs;
-	void *temp;
 	static int wad_loaded = false;
 	static int wad_numlumps = 0;
 	static lumpinfo_t *wad_lumps = NULL;
-	static qbyte *wad_base = NULL;
+	static unsigned char *wad_base = NULL;
 
 	W_CleanupName (name, clean);
 
 	if (!wad_loaded)
 	{
 		wad_loaded = true;
-		if ((temp = FS_LoadFile ("gfx.wad", tempmempool, false)))
+		if ((wad_base = FS_LoadFile ("gfx.wad", cl_mempool, false, &filesize)))
 		{
-			if (memcmp(temp, "WAD2", 4))
+			if (memcmp(wad_base, "WAD2", 4))
+			{
 				Con_Print("gfx.wad doesn't have WAD2 id\n");
+				Mem_Free(wad_base);
+				wad_base = NULL;
+			}
 			else
 			{
-				wad_base = Mem_Alloc(cl_mempool, fs_filesize);
-
-				memcpy(wad_base, temp, fs_filesize);
-				Mem_Free(temp);
-
 				header = (wadinfo_t *)wad_base;
 				wad_numlumps = LittleLong(header->numlumps);
 				infotableofs = LittleLong(header->infotableofs);
@@ -131,7 +130,7 @@ void SwapPic (qpic_t *pic)
 
 // LordHavoc: added alternate WAD2/WAD3 system for HalfLife texture wads
 #define TEXWAD_MAXIMAGES 16384
-typedef struct
+typedef struct texwadlump_s
 {
 	char name[16];
 	qfile_t *file;
@@ -175,7 +174,7 @@ void W_LoadTextureWadFile (char *filename, int complain)
 	infotableofs = LittleLong(header.infotableofs);
 	if (FS_Seek (file, infotableofs, SEEK_SET))
 	{Con_Print("W_LoadTextureWadFile: unable to seek to lump table\n");return;}
-	if (!(lumps = Mem_Alloc(tempmempool, sizeof(lumpinfo_t)*numlumps)))
+	if (!(lumps = (lumpinfo_t *)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) != (fs_offset_t)sizeof(lumpinfo_t) * numlumps)
@@ -206,13 +205,13 @@ void W_LoadTextureWadFile (char *filename, int complain)
 }
 
 
-qbyte *W_ConvertWAD3Texture(miptex_t *tex)
+unsigned char *W_ConvertWAD3Texture(miptex_t *tex)
 {
-	qbyte *in, *data, *out, *pal;
+	unsigned char *in, *data, *out, *pal;
 	int d, p;
 
-	in = (qbyte *)tex + tex->offsets[0];
-	data = out = Mem_Alloc(tempmempool, tex->width * tex->height * 4);
+	in = (unsigned char *)tex + tex->offsets[0];
+	data = out = (unsigned char *)Mem_Alloc(tempmempool, tex->width * tex->height * 4);
 	if (!data)
 		return NULL;
 	image_width = tex->width;
@@ -237,13 +236,13 @@ qbyte *W_ConvertWAD3Texture(miptex_t *tex)
 	return data;
 }
 
-qbyte *W_GetTexture(char *name)
+unsigned char *W_GetTexture(char *name)
 {
 	char texname[17];
 	int i, j;
 	qfile_t *file;
 	miptex_t *tex;
-	qbyte *data;
+	unsigned char *data;
 
 	texname[16] = 0;
 	W_CleanupName (name, texname);
@@ -257,7 +256,7 @@ qbyte *W_GetTexture(char *name)
 				if (FS_Seek(file, texwadlump[i].position, SEEK_SET))
 				{Con_Print("W_GetTexture: corrupt WAD3 file\n");return NULL;}
 
-				tex = Mem_Alloc(tempmempool, texwadlump[i].size);
+				tex = (miptex_t *)Mem_Alloc(tempmempool, texwadlump[i].size);
 				if (!tex)
 					return NULL;
 				if (FS_Read(file, tex, texwadlump[i].size) < texwadlump[i].size)