X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=wad.c;h=b73717e208ef35ef2ac91b48b5c5277ded2a39a3;hb=2cbfd57208b7e0050bf532456dedae601670af88;hp=23c0b6e6f13991133bc4014abdf3aeb2b98a009a;hpb=8d376b57de94bafd3bae224088b469649c853028;p=xonotic%2Fdarkplaces.git

diff --git a/wad.c b/wad.c
index 23c0b6e6..b73717e2 100644
--- a/wad.c
+++ b/wad.c
@@ -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)
@@ -255,12 +255,14 @@ unsigned char *W_GetTextureBGRA(char *name)
 	unsigned char *data;
 	mwad_t *w;
 	char texname[17];
+	size_t range;
 
 	texname[16] = 0;
 	W_CleanupName(name, texname);
 	if (!wad.hlwads.mempool)
 		Mem_ExpandableArray_NewArray(&wad.hlwads, cls.permanentmempool, sizeof(mwad_t), 16);
-	for (k = 0;k < Mem_ExpandableArray_IndexRange(&wad.hlwads);k++)
+	range = Mem_ExpandableArray_IndexRange(&wad.hlwads);
+	for (k = 0;k < range;k++)
 	{
 		w = (mwad_t *)Mem_ExpandableArray_RecordAtIndex(&wad.hlwads, k);
 		if (!w)