made darkplaces compile successfully with g++ to test for errors C doesn't care about...
[xonotic/darkplaces.git] / wad.c
diff --git a/wad.c b/wad.c
index c1ceb12..eda0e4c 100644 (file)
--- a/wad.c
+++ b/wad.c
@@ -17,12 +17,16 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-// wad.c
+
 
 #include "quakedef.h"
+#include "image.h"
+#include "wad.h"
+
 
 void SwapPic (qpic_t *pic);
 
+
 /*
 ==================
 W_CleanupName
@@ -34,7 +38,7 @@ Space padding is so names can be printed nicely in tables.
 Can safely be performed in place.
 ==================
 */
-static void W_CleanupName (char *in, char *out)
+static void W_CleanupName (const char *in, char *out)
 {
        int             i;
        int             c;
@@ -54,7 +58,7 @@ static void W_CleanupName (char *in, char *out)
                out[i] = 0;
 }
 
-void *W_GetLumpName(char *name)
+void *W_GetLumpName(const char *name)
 {
        int i;
        lumpinfo_t *lump;
@@ -66,21 +70,19 @@ 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);
 
        if (!wad_loaded)
        {
                wad_loaded = true;
-               if ((temp = FS_LoadFile ("gfx.wad", false)))
+               if ((temp = FS_LoadFile ("gfx.wad", tempmempool, false)))
                {
                        if (memcmp(temp, "WAD2", 4))
                                Con_Print("gfx.wad doesn't have WAD2 id\n");
                        else
                        {
-                               wad_mempool = Mem_AllocPool("gfx.wad");
-                               wad_base = Mem_Alloc(wad_mempool, fs_filesize);
+                               wad_base = (qbyte *)Mem_Alloc(cl_mempool, fs_filesize);
 
                                memcpy(wad_base, temp, fs_filesize);
                                Mem_Free(temp);
@@ -153,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)
@@ -173,10 +175,10 @@ void W_LoadTextureWadFile (char *filename, int complain)
        infotableofs = LittleLong(header.infotableofs);
        if (FS_Seek (file, infotableofs, SEEK_SET))
        {Con_Print("W_LoadTextureWadFile: unable to seek to lump table\n");return;}
-       if (!(lumps = Mem_Alloc(tempmempool, sizeof(lumpinfo_t)*numlumps)))
+       if (!(lumps = (lumpinfo_t *)Mem_Alloc(tempmempool, sizeof(lumpinfo_t)*numlumps)))
        {Con_Print("W_LoadTextureWadFile: unable to allocate temporary memory for lump table\n");return;}
 
-       if (FS_Read(file, lumps, sizeof(lumpinfo_t) * numlumps) != sizeof(lumpinfo_t) * (size_t)numlumps)
+       if (FS_Read(file, lumps, sizeof(lumpinfo_t) * numlumps) != (fs_offset_t)sizeof(lumpinfo_t) * numlumps)
        {Con_Print("W_LoadTextureWadFile: unable to read lump table\n");return;}
 
        for (i=0, lump_p = lumps ; i<numlumps ; i++,lump_p++)
@@ -209,8 +211,8 @@ qbyte *W_ConvertWAD3Texture(miptex_t *tex)
        qbyte *in, *data, *out, *pal;
        int d, p;
 
-       in = (qbyte *)((int) tex + tex->offsets[0]);
-       data = out = Mem_Alloc(tempmempool, tex->width * tex->height * 4);
+       in = (qbyte *)tex + tex->offsets[0];
+       data = out = (qbyte *)Mem_Alloc(tempmempool, tex->width * tex->height * 4);
        if (!data)
                return NULL;
        image_width = tex->width;
@@ -255,10 +257,10 @@ qbyte *W_GetTexture(char *name)
                                if (FS_Seek(file, texwadlump[i].position, SEEK_SET))
                                {Con_Print("W_GetTexture: corrupt WAD3 file\n");return NULL;}
 
-                               tex = Mem_Alloc(tempmempool, texwadlump[i].size);
+                               tex = (miptex_t *)Mem_Alloc(tempmempool, texwadlump[i].size);
                                if (!tex)
                                        return NULL;
-                               if (FS_Read(file, tex, texwadlump[i].size) < (size_t)texwadlump[i].size)
+                               if (FS_Read(file, tex, texwadlump[i].size) < texwadlump[i].size)
                                {Con_Print("W_GetTexture: corrupt WAD3 file\n");return NULL;}
 
                                tex->width = LittleLong(tex->width);