eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / wad.c

diff --git a/wad.c b/wad.c
index b0ea75f15b302bdf61e0402650215ad356b84dd0..027dec1a858ef87c7b53e942752ce2a39a8a7411 100644 (file)
--- a/wad.c
+++ b/wad.c
@@ -69,7 +69,7 @@ void *W_GetLumpName(const char *name)
        static int wad_loaded = false;
        static int wad_numlumps = 0;
        static lumpinfo_t *wad_lumps = NULL;
-       static qbyte *wad_base = NULL;
+       static unsigned char *wad_base = NULL;
 
        W_CleanupName (name, clean);
 
@@ -82,7 +82,7 @@ void *W_GetLumpName(const char *name)
                                Con_Print("gfx.wad doesn't have WAD2 id\n");
                        else
                        {
-                               wad_base = Mem_Alloc(cl_mempool, fs_filesize);
+                               wad_base = (unsigned char *)Mem_Alloc(cl_mempool, fs_filesize);
 
                                memcpy(wad_base, temp, fs_filesize);
                                Mem_Free(temp);
@@ -131,7 +131,7 @@ void SwapPic (qpic_t *pic)
 
 // LordHavoc: added alternate WAD2/WAD3 system for HalfLife texture wads
 #define TEXWAD_MAXIMAGES 16384
-typedef struct
+typedef struct texwadlump_s
 {
        char name[16];
        qfile_t *file;
@@ -175,7 +175,7 @@ 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) != (fs_offset_t)sizeof(lumpinfo_t) * numlumps)
@@ -206,13 +206,13 @@ void W_LoadTextureWadFile (char *filename, int complain)
 }
 
 
-qbyte *W_ConvertWAD3Texture(miptex_t *tex)
+unsigned char *W_ConvertWAD3Texture(miptex_t *tex)
 {
-       qbyte *in, *data, *out, *pal;
+       unsigned char *in, *data, *out, *pal;
        int d, p;
 
-       in = (qbyte *)tex + tex->offsets[0];
-       data = out = Mem_Alloc(tempmempool, tex->width * tex->height * 4);
+       in = (unsigned char *)tex + tex->offsets[0];
+       data = out = (unsigned char *)Mem_Alloc(tempmempool, tex->width * tex->height * 4);
        if (!data)
                return NULL;
        image_width = tex->width;
@@ -237,13 +237,13 @@ qbyte *W_ConvertWAD3Texture(miptex_t *tex)
        return data;
 }
 
-qbyte *W_GetTexture(char *name)
+unsigned char *W_GetTexture(char *name)
 {
        char texname[17];
        int i, j;
        qfile_t *file;
        miptex_t *tex;
-       qbyte *data;
+       unsigned char *data;
 
        texname[16] = 0;
        W_CleanupName (name, texname);
@@ -257,7 +257,7 @@ 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) < texwadlump[i].size)