X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=wad.c;h=b0ea75f15b302bdf61e0402650215ad356b84dd0;hp=23bb8bcec01af296960cb17534d1b97879e814e0;hb=760ae8779d3f4a93510bcad762fce16728631936;hpb=f9b42aa4394dfa42d48c4dc5e8d39fce776d05dd

diff --git a/wad.c b/wad.c
index 23bb8bce..b0ea75f1 100644
--- a/wad.c
+++ b/wad.c
@@ -17,12 +17,16 @@ along with this program; if not, write to the Free Software
 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
@@ -34,7 +38,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;
@@ -54,7 +58,7 @@ static void W_CleanupName (char *in, char *out)
 		out[i] = 0;
 }
 
-void *W_GetLumpName(char *name)
+void *W_GetLumpName(const char *name)
 {
 	int i;
 	lumpinfo_t *lump;
@@ -66,21 +70,19 @@ void *W_GetLumpName(char *name)
 	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)
 	{
 		wad_loaded = true;
-		if ((temp = FS_LoadFile ("gfx.wad", false)))
+		if ((temp = FS_LoadFile ("gfx.wad", tempmempool, false)))
 		{
 			if (memcmp(temp, "WAD2", 4))
-				Con_Printf("gfx.wad doesn't have WAD2 id\n");
+				Con_Print("gfx.wad doesn't have WAD2 id\n");
 			else
 			{
-				wad_mempool = Mem_AllocPool("gfx.wad");
-				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);
@@ -153,31 +155,31 @@ void W_LoadTextureWadFile (char *filename, int complain)
 	qfile_t			*file;
 	int				numlumps;
 
-	file = FS_Open (filename, "rb", false);
+	file = FS_Open (filename, "rb", false, false);
 	if (!file)
 	{
 		if (complain)
-			Con_Printf ("W_LoadTextureWadFile: couldn't find %s", filename);
+			Con_Printf("W_LoadTextureWadFile: couldn't find %s\n", filename);
 		return;
 	}
 
 	if (FS_Read(file, &header, sizeof(wadinfo_t)) != sizeof(wadinfo_t))
-	{Con_Printf ("W_LoadTextureWadFile: unable to read wad header");return;}
+	{Con_Print("W_LoadTextureWadFile: unable to read wad header\n");return;}
 
 	if(memcmp(header.identification, "WAD3", 4))
-	{Con_Printf ("W_LoadTextureWadFile: Wad file %s doesn't have WAD3 id\n",filename);return;}
+	{Con_Printf("W_LoadTextureWadFile: Wad file %s doesn't have WAD3 id\n",filename);return;}
 
 	numlumps = LittleLong(header.numlumps);
 	if (numlumps < 1 || numlumps > TEXWAD_MAXIMAGES)
-	{Con_Printf ("W_LoadTextureWadFile: invalid number of lumps (%i)\n", numlumps);return;}
+	{Con_Printf("W_LoadTextureWadFile: invalid number of lumps (%i)\n", numlumps);return;}
 	infotableofs = LittleLong(header.infotableofs);
 	if (FS_Seek (file, infotableofs, SEEK_SET))
-	{Con_Printf ("W_LoadTextureWadFile: unable to seek to lump table");return;}
+	{Con_Print("W_LoadTextureWadFile: unable to seek to lump table\n");return;}
 	if (!(lumps = Mem_Alloc(tempmempool, sizeof(lumpinfo_t)*numlumps)))
-	{Con_Printf ("W_LoadTextureWadFile: unable to allocate temporary memory for lump table");return;}
+	{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)
-	{Con_Printf ("W_LoadTextureWadFile: unable to read lump table");return;}
+	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++)
 	{
@@ -209,7 +211,7 @@ qbyte *W_ConvertWAD3Texture(miptex_t *tex)
 	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;
@@ -253,13 +255,13 @@ qbyte *W_GetTexture(char *name)
 			{
 				file = texwadlump[i].file;
 				if (FS_Seek(file, texwadlump[i].position, SEEK_SET))
-				{Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;}
+				{Con_Print("W_GetTexture: corrupt WAD3 file\n");return NULL;}
 
 				tex = Mem_Alloc(tempmempool, texwadlump[i].size);
 				if (!tex)
 					return NULL;
-				if (FS_Read(file, tex, texwadlump[i].size) < (size_t)texwadlump[i].size)
-				{Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;}
+				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);
 				tex->height = LittleLong(tex->height);