added nexuiz icon and make rules to make use of it, and now the icon is included...

[xonotic/darkplaces.git] / wad.c

diff --git a/wad.c b/wad.c
index 027dec1a858ef87c7b53e942752ce2a39a8a7411..7d488dbd961359f8b10733fa7ba20c7680c88c4e 100644 (file)
--- a/wad.c
+++ b/wad.c
@@ -61,11 +61,11 @@ static void W_CleanupName (const char *in, char *out)
 void *W_GetLumpName(const char *name)
 {
        int i;
 void *W_GetLumpName(const char *name)
 {
        int i;

+       fs_offset_t filesize;

        lumpinfo_t *lump;
        char clean[16];
        wadinfo_t *header;
        int infotableofs;
        lumpinfo_t *lump;
        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;
        static int wad_loaded = false;
        static int wad_numlumps = 0;
        static lumpinfo_t *wad_lumps = NULL;


@@ -76,17 +76,16 @@ void *W_GetLumpName(const char *name)
        if (!wad_loaded)
        {
                wad_loaded = true;
        if (!wad_loaded)
        {
                wad_loaded = true;

-               if ((temp = FS_LoadFile ("gfx.wad", tempmempool, false)))
+               if ((wad_base = FS_LoadFile ("gfx.wad", cl_mempool, false, &filesize)))

                {
                {

-                       if (memcmp(temp, "WAD2", 4))
+                       if (memcmp(wad_base, "WAD2", 4))
+                       {

                                Con_Print("gfx.wad doesn't have WAD2 id\n");
                                Con_Print("gfx.wad doesn't have WAD2 id\n");

+                               Mem_Free(wad_base);
+                               wad_base = NULL;
+                       }

                        else
                        {
                        else
                        {

-                               wad_base = (unsigned char *)Mem_Alloc(cl_mempool, fs_filesize);
-
-                               memcpy(wad_base, temp, fs_filesize);
-                               Mem_Free(temp);
-

                                header = (wadinfo_t *)wad_base;
                                wad_numlumps = LittleLong(header->numlumps);
                                infotableofs = LittleLong(header->infotableofs);
                                header = (wadinfo_t *)wad_base;
                                wad_numlumps = LittleLong(header->numlumps);
                                infotableofs = LittleLong(header->infotableofs);