X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=wad.c;h=333e619bccdc14a3ed61e1cd054effcb984af9e1;hp=c1ceb1260ecfb423e5dbd223598221edcaf8cc16;hb=e88a73794afa1f0fe65fc70d318f4e288cabc0d1;hpb=ff46d6ff516fda192c5adc55a5c9b82007545bd2

diff --git a/wad.c b/wad.c
index c1ceb126..333e619b 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_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,7 +155,7 @@ 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)
@@ -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;