X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=wad.c;h=2183b8e3f9962577be9a5ec40b6c13e261dc9277;hb=19259a56af993def9d5160bb2eb32e35a2fc6398;hp=44f39f310273351c93f08a6714f614521a4111f7;hpb=1e1dbc1c5b89ae4ab8cdd9b32dc6413c67f5dd84;p=xonotic%2Fdarkplaces.git

diff --git a/wad.c b/wad.c
index 44f39f31..2183b8e3 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
@@ -79,7 +83,7 @@ void *W_GetLumpName(char *name)
 				Con_Print("gfx.wad doesn't have WAD2 id\n");
 			else
 			{
-				wad_mempool = Mem_AllocPool("gfx.wad");
+				wad_mempool = Mem_AllocPool("gfx.wad", 0, NULL);
 				wad_base = Mem_Alloc(wad_mempool, fs_filesize);
 
 				memcpy(wad_base, temp, fs_filesize);
@@ -153,7 +157,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 +213,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;