X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=wad.c;h=12978f383a6b8969343bb543c0e3df60cca91c2b;hb=3a1e31d2cbf35505278d48bc9bf9d5e3902fd3b7;hp=2183b8e3f9962577be9a5ec40b6c13e261dc9277;hpb=9dc8149ee231682452a52a4ec4bdee3981da5492;p=xonotic%2Fdarkplaces.git

diff --git a/wad.c b/wad.c
index 2183b8e3..12978f38 100644
--- a/wad.c
+++ b/wad.c
@@ -24,9 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "wad.h"
 
 
-void SwapPic (qpic_t *pic);
-
-
 /*
 ==================
 W_CleanupName
@@ -38,7 +35,7 @@ Space padding is so names can be printed nicely in tables.
 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;
@@ -58,37 +55,33 @@ static void W_CleanupName (char *in, char *out)
 		out[i] = 0;
 }
 
-void *W_GetLumpName(char *name)
+static int wad_numlumps = 0;
+static lumpinfo_t *wad_lumps = NULL;
+static unsigned char *wad_base = NULL;
+
+unsigned char *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 mempool_t *wad_mempool = NULL;
 
 	W_CleanupName (name, clean);
 
-	if (!wad_loaded)
+	if (!wad_base)
 	{
-		wad_loaded = true;
-		if ((temp = FS_LoadFile ("gfx.wad", tempmempool, false)))
+		if ((wad_base = FS_LoadFile ("gfx.wad", cls.permanentmempool, 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_mempool = Mem_AllocPool("gfx.wad", 0, NULL);
-				wad_base = Mem_Alloc(wad_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);
@@ -99,8 +92,6 @@ void *W_GetLumpName(char *name)
 					lump->filepos = LittleLong(lump->filepos);
 					lump->size = LittleLong(lump->size);
 					W_CleanupName (lump->name, lump->name);
-					if (lump->type == TYP_QPIC)
-						SwapPic ( (qpic_t *)(wad_base + lump->filepos));
 				}
 			}
 		}
@@ -108,7 +99,7 @@ void *W_GetLumpName(char *name)
 
 	for (lump = wad_lumps, i = 0;i < wad_numlumps;i++, lump++)
 		if (!strcmp(clean, lump->name))
-			return (void *)(wad_base + lump->filepos);
+			return (wad_base + lump->filepos);
 
 	if (wad_base)
 		Con_DPrintf("W_GetLumpByName(\"%s\"): couldn't find file in gfx.wad\n", name);
@@ -125,15 +116,9 @@ automatic byte swapping
 =============================================================================
 */
 
-void SwapPic (qpic_t *pic)
-{
-	pic->width = LittleLong(pic->width);
-	pic->height = LittleLong(pic->height);
-}
-
 // 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;
@@ -177,10 +162,10 @@ 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) != 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++)
@@ -208,13 +193,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;
@@ -239,13 +224,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);
@@ -259,10 +244,10 @@ 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) < (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);