fixed a stupid bug in SV_PushMove that made it ignore the first entity in the move box

[xonotic/darkplaces.git] / wad.c

diff --git a/wad.c b/wad.c
index 0f4459c89862d23066a1593ca141ec81947b0adc..35671d6e89e36fd03a6e45826d7bd6a10021739e 100644 (file)
--- a/wad.c
+++ b/wad.c
@@ -70,7 +70,6 @@ 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);
 
@@ -83,8 +82,7 @@ void *W_GetLumpName(char *name)
                                Con_Print("gfx.wad doesn't have WAD2 id\n");
                        else
                        {
-                               wad_mempool = Mem_AllocPool("gfx.wad", 0, NULL);
-                               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);
@@ -157,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)