X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=wad.c;h=7087ce69a909a69ddc4f67a63b75687c54037837;hb=01ba19424cec267526ca273d809516ff36fe23cb;hp=13a7b9fdfcd6aa55c17e5d1b7261a7c76b2979ba;hpb=ea3f4513f96a21ae1bcbaae4a4997968ace1ab95;p=xonotic%2Fdarkplaces.git diff --git a/wad.c b/wad.c index 13a7b9fd..7087ce69 100644 --- a/wad.c +++ b/wad.c @@ -66,7 +66,6 @@ void *W_GetLumpName(const char *name) char clean[16]; wadinfo_t *header; int infotableofs; - void *temp; static int wad_loaded = false; static int wad_numlumps = 0; static lumpinfo_t *wad_lumps = NULL; @@ -77,9 +76,9 @@ void *W_GetLumpName(const char *name) if (!wad_loaded) { wad_loaded = true; - if ((wad_base = FS_LoadFile ("gfx.wad", cl_mempool, false, &filesize))) + if ((wad_base = FS_LoadFile ("gfx.wad", cls.permanentmempool, false, &filesize))) { - if (memcmp(temp, "WAD2", 4)) + if (memcmp(wad_base, "WAD2", 4)) { Con_Print("gfx.wad doesn't have WAD2 id\n"); Mem_Free(wad_base);