-Added support for 515]'s BX_COLOREDTEXT extension.

[xonotic/darkplaces.git] / wad.c

diff --git a/wad.c b/wad.c
index 0f4459c89862d23066a1593ca141ec81947b0adc..333e619bccdc14a3ed61e1cd054effcb984af9e1 100644 (file)
--- a/wad.c
+++ b/wad.c
@@ -38,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;
@@ -58,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;
@@ -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)