X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=wad.c;h=a07f87bb135560c919b9564c038cc8b337b85eaf;hb=559a8c51d08b9ed77c776fd1595932de849f7a12;hp=25dd95cf53bc0c30b22904b705193a7afc8c3bbd;hpb=32432e964a2096d912e7500738d9e1bf1d7925db;p=xonotic%2Fdarkplaces.git

diff --git a/wad.c b/wad.c
index 25dd95cf..a07f87bb 100644
--- a/wad.c
+++ b/wad.c
@@ -95,7 +95,7 @@ void W_UnloadAll(void)
 	// close all hlwad files and free their lumps data
 	for (i = 0;i < Mem_ExpandableArray_IndexRange(&wad.hlwads);i++)
 	{
-		w = Mem_ExpandableArray_RecordAtIndex(&wad.hlwads, i);
+		w = (mwad_t *) Mem_ExpandableArray_RecordAtIndex(&wad.hlwads, i);
 		if (!w)
 			continue;
 		if (w->file)
@@ -164,7 +164,7 @@ void W_LoadTextureWadFile (char *filename, int complain)
 	int				numlumps;
 	mwad_t			*w;
 
-	file = FS_Open (filename, "rb", false, false);
+	file = FS_OpenVirtualFile(filename, false);
 	if (!file)
 	{
 		if (complain)
@@ -187,10 +187,10 @@ void W_LoadTextureWadFile (char *filename, int complain)
 
 	if (!wad.hlwads.mempool)
 		Mem_ExpandableArray_NewArray(&wad.hlwads, cls.permanentmempool, sizeof(mwad_t), 16);
-	w = Mem_ExpandableArray_AllocRecord(&wad.hlwads);
+	w = (mwad_t *) Mem_ExpandableArray_AllocRecord(&wad.hlwads);
 	w->file = file;
 	w->numlumps = numlumps;
-	w->lumps = Mem_Alloc(cls.permanentmempool, w->numlumps * sizeof(lumpinfo_t));
+	w->lumps = (lumpinfo_t *) Mem_Alloc(cls.permanentmempool, w->numlumps * sizeof(lumpinfo_t));
 
 	if (!w->lumps)
 	{