X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=wad.c;h=55da49963bd731d96f612fa426a0173e5c7f2cbf;hp=4414197f2fcb5831599b02f73d76602601b79105;hb=b99206803156d4bdfe4ce0c83a2db8f9486e09d4;hpb=c4ee1bbcc6b2f917465f07269ad09942bbf40849 diff --git a/wad.c b/wad.c index 4414197f..55da4996 100644 --- a/wad.c +++ b/wad.c @@ -17,16 +17,29 @@ 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" -static int wad_numlumps; -static lumpinfo_t *wad_lumps; -static qbyte *wad_base = NULL; -static mempool_t *wad_mempool = NULL; +typedef struct mwad_s +{ + qfile_t *file; + int numlumps; + lumpinfo_t *lumps; +} +mwad_t; + +typedef struct wadstate_s +{ + unsigned char *gfx_base; + mwad_t gfx; + memexpandablearray_t hlwads; +} +wadstate_t; -void SwapPic (qpic_t *pic); +static wadstate_t wad; /* ================== @@ -39,7 +52,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; @@ -59,94 +72,91 @@ static void W_CleanupName (char *in, char *out) out[i] = 0; } - - -/* -==================== -W_LoadWadFile -==================== -*/ -void W_LoadWadFile (char *filename) +static void W_SwapLumps(int numlumps, lumpinfo_t *lumps) { - lumpinfo_t *lump_p; - wadinfo_t *header; - unsigned i; - int infotableofs; - void *temp; - - temp = COM_LoadFile (filename, false); - if (!temp) - Sys_Error ("W_LoadWadFile: couldn't load %s", filename); - - if (wad_mempool) - Mem_FreePool(&wad_mempool); - wad_mempool = Mem_AllocPool(filename); - wad_base = Mem_Alloc(wad_mempool, loadsize); - - memcpy(wad_base, temp, loadsize); - Mem_Free(temp); - - header = (wadinfo_t *)wad_base; - - if (memcmp(header->identification, "WAD2", 4)) - Sys_Error ("Wad file %s doesn't have WAD2 id\n",filename); - - wad_numlumps = LittleLong(header->numlumps); - infotableofs = LittleLong(header->infotableofs); - wad_lumps = (lumpinfo_t *)(wad_base + infotableofs); + int i; + for (i = 0;i < numlumps;i++) + { + lumps[i].filepos = LittleLong(lumps[i].filepos); + lumps[i].disksize = LittleLong(lumps[i].disksize); + lumps[i].size = LittleLong(lumps[i].size); + W_CleanupName(lumps[i].name, lumps[i].name); + } +} - for (i=0, lump_p = wad_lumps ; ifilepos = LittleLong(lump_p->filepos); - lump_p->size = LittleLong(lump_p->size); - W_CleanupName (lump_p->name, lump_p->name); - if (lump_p->type == TYP_QPIC) - SwapPic ( (qpic_t *)(wad_base + lump_p->filepos)); + w = (mwad_t *) Mem_ExpandableArray_RecordAtIndex(&wad.hlwads, i); + if (!w) + continue; + if (w->file) + FS_Close(w->file); + w->file = NULL; + if (w->lumps) + Mem_Free(w->lumps); + w->lumps = NULL; } + // free the hlwads array + Mem_ExpandableArray_FreeArray(&wad.hlwads); + // clear all state + memset(&wad, 0, sizeof(wad)); } -void *W_GetLumpName (char *name) +unsigned char *W_GetLumpName(const char *name, fs_offset_t *returnfilesize) { - int i; - lumpinfo_t *lump; - char clean[16]; + int i; + fs_offset_t filesize; + lumpinfo_t *lump; + char clean[16]; + wadinfo_t *header; + int infotableofs; W_CleanupName (name, clean); - for (lump = wad_lumps, i = 0;i < wad_numlumps;i++, lump++) - if (!strcmp(clean, lump->name)) - return (void *)(wad_base + lump->filepos); - - //Sys_Error ("W_GetLumpinfo: %s not found", name); - return NULL; -} - -/* -============================================================================= - -automatic byte swapping + if (!wad.gfx_base) + { + if ((wad.gfx_base = FS_LoadFile ("gfx.wad", cls.permanentmempool, false, &filesize))) + { + if (memcmp(wad.gfx_base, "WAD2", 4)) + { + Con_Print("gfx.wad doesn't have WAD2 id\n"); + Mem_Free(wad.gfx_base); + wad.gfx_base = NULL; + } + else + { + header = (wadinfo_t *)wad.gfx_base; + wad.gfx.numlumps = LittleLong(header->numlumps); + infotableofs = LittleLong(header->infotableofs); + wad.gfx.lumps = (lumpinfo_t *)(wad.gfx_base + infotableofs); -============================================================================= -*/ + // byteswap the gfx.wad lumps in place + W_SwapLumps(wad.gfx.numlumps, wad.gfx.lumps); + } + } + } -void SwapPic (qpic_t *pic) -{ - pic->width = LittleLong(pic->width); - pic->height = LittleLong(pic->height); + for (lump = wad.gfx.lumps, i = 0;i < wad.gfx.numlumps;i++, lump++) + { + if (!strcmp(clean, lump->name)) + { + if (returnfilesize) + *returnfilesize = lump->size; + return (wad.gfx_base + lump->filepos); + } + } + return NULL; } -// LordHavoc: added alternate WAD2/WAD3 system for HalfLife texture wads -#define TEXWAD_MAXIMAGES 16384 -typedef struct -{ - char name[16]; - QFile *file; - int position; - int size; -} texwadlump_t; - -static texwadlump_t texwadlump[TEXWAD_MAXIMAGES]; - /* ==================== W_LoadTextureWadFile @@ -154,144 +164,109 @@ W_LoadTextureWadFile */ void W_LoadTextureWadFile (char *filename, int complain) { - lumpinfo_t *lumps, *lump_p; wadinfo_t header; - unsigned i, j; int infotableofs; - QFile *file; + qfile_t *file; int numlumps; + mwad_t *w; - COM_FOpenFile (filename, &file, false, false); + file = FS_OpenVirtualFile(filename, false); if (!file) { if (complain) - Con_Printf ("W_LoadTextureWadFile: couldn't find %s", filename); + Con_Printf(CON_ERROR "W_LoadTextureWadFile: couldn't find %s\n", filename); return; } - if (Qread(file, &header, sizeof(wadinfo_t)) != sizeof(wadinfo_t)) - {Con_Printf ("W_LoadTextureWadFile: unable to read wad header");return;} + if (FS_Read(file, &header, sizeof(wadinfo_t)) != sizeof(wadinfo_t)) + {Con_Print(CON_ERROR "W_LoadTextureWadFile: unable to read wad header\n");FS_Close(file);file = NULL;return;} if(memcmp(header.identification, "WAD3", 4)) - {Con_Printf ("W_LoadTextureWadFile: Wad file %s doesn't have WAD3 id\n",filename);return;} + {Con_Printf(CON_ERROR "W_LoadTextureWadFile: Wad file %s doesn't have WAD3 id\n",filename);FS_Close(file);file = NULL;return;} numlumps = LittleLong(header.numlumps); - if (numlumps < 1 || numlumps > TEXWAD_MAXIMAGES) - {Con_Printf ("W_LoadTextureWadFile: invalid number of lumps (%i)\n", numlumps);return;} + if (numlumps < 1 || numlumps > 65536) + {Con_Printf(CON_ERROR "W_LoadTextureWadFile: invalid number of lumps (%i)\n", numlumps);FS_Close(file);file = NULL;return;} infotableofs = LittleLong(header.infotableofs); - if (Qseek(file, infotableofs, SEEK_SET)) - {Con_Printf ("W_LoadTextureWadFile: unable to seek to lump table");return;} - if (!(lumps = Mem_Alloc(tempmempool, sizeof(lumpinfo_t)*numlumps))) - {Con_Printf ("W_LoadTextureWadFile: unable to allocate temporary memory for lump table");return;} + if (FS_Seek (file, infotableofs, SEEK_SET)) + {Con_Print(CON_ERROR "W_LoadTextureWadFile: unable to seek to lump table\n");FS_Close(file);file = NULL;return;} - if (Qread(file, lumps, sizeof(lumpinfo_t) * numlumps) != sizeof(lumpinfo_t) * numlumps) - {Con_Printf ("W_LoadTextureWadFile: unable to read lump table");return;} + if (!wad.hlwads.mempool) + Mem_ExpandableArray_NewArray(&wad.hlwads, cls.permanentmempool, sizeof(mwad_t), 16); + w = (mwad_t *) Mem_ExpandableArray_AllocRecord(&wad.hlwads); + w->file = file; + w->numlumps = numlumps; + w->lumps = (lumpinfo_t *) Mem_Alloc(cls.permanentmempool, w->numlumps * sizeof(lumpinfo_t)); - for (i=0, lump_p = lumps ; ilumps) { - W_CleanupName (lump_p->name, lump_p->name); - for (j = 0;j < TEXWAD_MAXIMAGES;j++) - { - if (texwadlump[j].name[0]) // occupied slot, check the name - { - if (!strcmp(lump_p->name, texwadlump[j].name)) // name match, replace old one - break; - } - else // empty slot - break; - } - if (j >= TEXWAD_MAXIMAGES) - break; // abort loading - W_CleanupName (lump_p->name, texwadlump[j].name); - texwadlump[j].file = file; - texwadlump[j].position = LittleLong(lump_p->filepos); - texwadlump[j].size = LittleLong(lump_p->disksize); + Con_Print(CON_ERROR "W_LoadTextureWadFile: unable to allocate temporary memory for lump table\n"); + FS_Close(w->file); + w->file = NULL; + w->numlumps = 0; + return; } - Mem_Free(lumps); + + if (FS_Read(file, w->lumps, sizeof(lumpinfo_t) * w->numlumps) != (fs_offset_t)sizeof(lumpinfo_t) * numlumps) + { + Con_Print(CON_ERROR "W_LoadTextureWadFile: unable to read lump table\n"); + FS_Close(w->file); + w->file = NULL; + w->numlumps = 0; + Mem_Free(w->lumps); + w->lumps = NULL; + return; + } + + W_SwapLumps(w->numlumps, w->lumps); + // leaves the file open } -/* -qbyte hlpalette[768] = -{ - 0x00,0x00,0x00,0x0F,0x0F,0x0F,0x1F,0x1F,0x1F,0x2F,0x2F,0x2F,0x3F,0x3F,0x3F,0x4B, - 0x4B,0x4B,0x5B,0x5B,0x5B,0x6B,0x6B,0x6B,0x7B,0x7B,0x7B,0x8B,0x8B,0x8B,0x9B,0x9B, - 0x9B,0xAB,0xAB,0xAB,0xBB,0xBB,0xBB,0xCB,0xCB,0xCB,0xDB,0xDB,0xDB,0xEB,0xEB,0xEB, - 0x0F,0x0B,0x07,0x17,0x0F,0x0B,0x1F,0x17,0x0B,0x27,0x1B,0x0F,0x2F,0x23,0x13,0x37, - 0x2B,0x17,0x3F,0x2F,0x17,0x4B,0x37,0x1B,0x53,0x3B,0x1B,0x5B,0x43,0x1F,0x63,0x4B, - 0x1F,0x6B,0x53,0x1F,0x73,0x57,0x1F,0x7B,0x5F,0x23,0x83,0x67,0x23,0x8F,0x6F,0x23, - 0x0B,0x0B,0x0F,0x13,0x13,0x1B,0x1B,0x1B,0x27,0x27,0x27,0x33,0x2F,0x2F,0x3F,0x37, - 0x37,0x4B,0x3F,0x3F,0x57,0x47,0x47,0x67,0x4F,0x4F,0x73,0x5B,0x5B,0x7F,0x63,0x63, - 0x8B,0x6B,0x6B,0x97,0x73,0x73,0xA3,0x7B,0x7B,0xAF,0x83,0x83,0xBB,0x8B,0x8B,0xCB, - 0x00,0x00,0x00,0x07,0x07,0x00,0x0B,0x0B,0x00,0x13,0x13,0x00,0x1B,0x1B,0x00,0x23, - 0x23,0x00,0x2B,0x2B,0x07,0x2F,0x2F,0x07,0x37,0x37,0x07,0x3F,0x3F,0x07,0x47,0x47, - 0x07,0x4B,0x4B,0x0B,0x53,0x53,0x0B,0x5B,0x5B,0x0B,0x63,0x63,0x0B,0x6B,0x6B,0x0F, - 0x07,0x00,0x00,0x0F,0x00,0x00,0x17,0x00,0x00,0x1F,0x00,0x00,0x27,0x00,0x00,0x2F, - 0x00,0x00,0x37,0x00,0x00,0x3F,0x00,0x00,0x47,0x00,0x00,0x4F,0x00,0x00,0x57,0x00, - 0x00,0x5F,0x00,0x00,0x67,0x00,0x00,0x6F,0x00,0x00,0x77,0x00,0x00,0x7F,0x00,0x00, - 0x13,0x13,0x00,0x1B,0x1B,0x00,0x23,0x23,0x00,0x2F,0x2B,0x00,0x37,0x2F,0x00,0x43, - 0x37,0x00,0x4B,0x3B,0x07,0x57,0x43,0x07,0x5F,0x47,0x07,0x6B,0x4B,0x0B,0x77,0x53, - 0x0F,0x83,0x57,0x13,0x8B,0x5B,0x13,0x97,0x5F,0x1B,0xA3,0x63,0x1F,0xAF,0x67,0x23, - 0x23,0x13,0x07,0x2F,0x17,0x0B,0x3B,0x1F,0x0F,0x4B,0x23,0x13,0x57,0x2B,0x17,0x63, - 0x2F,0x1F,0x73,0x37,0x23,0x7F,0x3B,0x2B,0x8F,0x43,0x33,0x9F,0x4F,0x33,0xAF,0x63, - 0x2F,0xBF,0x77,0x2F,0xCF,0x8F,0x2B,0xDF,0xAB,0x27,0xEF,0xCB,0x1F,0xFF,0xF3,0x1B, - 0x0B,0x07,0x00,0x1B,0x13,0x00,0x2B,0x23,0x0F,0x37,0x2B,0x13,0x47,0x33,0x1B,0x53, - 0x37,0x23,0x63,0x3F,0x2B,0x6F,0x47,0x33,0x7F,0x53,0x3F,0x8B,0x5F,0x47,0x9B,0x6B, - 0x53,0xA7,0x7B,0x5F,0xB7,0x87,0x6B,0xC3,0x93,0x7B,0xD3,0xA3,0x8B,0xE3,0xB3,0x97, - 0xAB,0x8B,0xA3,0x9F,0x7F,0x97,0x93,0x73,0x87,0x8B,0x67,0x7B,0x7F,0x5B,0x6F,0x77, - 0x53,0x63,0x6B,0x4B,0x57,0x5F,0x3F,0x4B,0x57,0x37,0x43,0x4B,0x2F,0x37,0x43,0x27, - 0x2F,0x37,0x1F,0x23,0x2B,0x17,0x1B,0x23,0x13,0x13,0x17,0x0B,0x0B,0x0F,0x07,0x07, - 0xBB,0x73,0x9F,0xAF,0x6B,0x8F,0xA3,0x5F,0x83,0x97,0x57,0x77,0x8B,0x4F,0x6B,0x7F, - 0x4B,0x5F,0x73,0x43,0x53,0x6B,0x3B,0x4B,0x5F,0x33,0x3F,0x53,0x2B,0x37,0x47,0x23, - 0x2B,0x3B,0x1F,0x23,0x2F,0x17,0x1B,0x23,0x13,0x13,0x17,0x0B,0x0B,0x0F,0x07,0x07, - 0xDB,0xC3,0xBB,0xCB,0xB3,0xA7,0xBF,0xA3,0x9B,0xAF,0x97,0x8B,0xA3,0x87,0x7B,0x97, - 0x7B,0x6F,0x87,0x6F,0x5F,0x7B,0x63,0x53,0x6B,0x57,0x47,0x5F,0x4B,0x3B,0x53,0x3F, - 0x33,0x43,0x33,0x27,0x37,0x2B,0x1F,0x27,0x1F,0x17,0x1B,0x13,0x0F,0x0F,0x0B,0x07, - 0x6F,0x83,0x7B,0x67,0x7B,0x6F,0x5F,0x73,0x67,0x57,0x6B,0x5F,0x4F,0x63,0x57,0x47, - 0x5B,0x4F,0x3F,0x53,0x47,0x37,0x4B,0x3F,0x2F,0x43,0x37,0x2B,0x3B,0x2F,0x23,0x33, - 0x27,0x1F,0x2B,0x1F,0x17,0x23,0x17,0x0F,0x1B,0x13,0x0B,0x13,0x0B,0x07,0x0B,0x07, - 0xFF,0xF3,0x1B,0xEF,0xDF,0x17,0xDB,0xCB,0x13,0xCB,0xB7,0x0F,0xBB,0xA7,0x0F,0xAB, - 0x97,0x0B,0x9B,0x83,0x07,0x8B,0x73,0x07,0x7B,0x63,0x07,0x6B,0x53,0x00,0x5B,0x47, - 0x00,0x4B,0x37,0x00,0x3B,0x2B,0x00,0x2B,0x1F,0x00,0x1B,0x0F,0x00,0x0B,0x07,0x00, - 0x00,0x00,0xFF,0x0B,0x0B,0xEF,0x13,0x13,0xDF,0x1B,0x1B,0xCF,0x23,0x23,0xBF,0x2B, - 0x2B,0xAF,0x2F,0x2F,0x9F,0x2F,0x2F,0x8F,0x2F,0x2F,0x7F,0x2F,0x2F,0x6F,0x2F,0x2F, - 0x5F,0x2B,0x2B,0x4F,0x23,0x23,0x3F,0x1B,0x1B,0x2F,0x13,0x13,0x1F,0x0B,0x0B,0x0F, - 0x2B,0x00,0x00,0x3B,0x00,0x00,0x4B,0x07,0x00,0x5F,0x07,0x00,0x6F,0x0F,0x00,0x7F, - 0x17,0x07,0x93,0x1F,0x07,0xA3,0x27,0x0B,0xB7,0x33,0x0F,0xC3,0x4B,0x1B,0xCF,0x63, - 0x2B,0xDB,0x7F,0x3B,0xE3,0x97,0x4F,0xE7,0xAB,0x5F,0xEF,0xBF,0x77,0xF7,0xD3,0x8B, - 0xA7,0x7B,0x3B,0xB7,0x9B,0x37,0xC7,0xC3,0x37,0xE7,0xE3,0x57,0x00,0xFF,0x00,0xAB, - 0xE7,0xFF,0xD7,0xFF,0xFF,0x67,0x00,0x00,0x8B,0x00,0x00,0xB3,0x00,0x00,0xD7,0x00, - 0x00,0xFF,0x00,0x00,0xFF,0xF3,0x93,0xFF,0xF7,0xC7,0xFF,0xFF,0xFF,0x9F,0x5B,0x53, -}; -*/ - -qbyte *W_ConvertWAD3Texture(miptex_t *tex) +unsigned char *W_ConvertWAD3TextureBGRA(sizebuf_t *sb) { - qbyte *in, *data, *out, *pal; -// int palsize; + unsigned char *in, *data, *out, *pal; int d, p; - in = (qbyte *)((int) tex + tex->offsets[0]); - data = out = Mem_Alloc(tempmempool, tex->width * tex->height * 4); + unsigned char name[16]; + unsigned int mipoffset[4]; + + MSG_BeginReading(sb); + MSG_ReadBytes(sb, 16, name); + image_width = MSG_ReadLittleLong(sb); + image_height = MSG_ReadLittleLong(sb); + mipoffset[0] = MSG_ReadLittleLong(sb); + mipoffset[1] = MSG_ReadLittleLong(sb); // should be mipoffset[0] + image_width*image_height + mipoffset[2] = MSG_ReadLittleLong(sb); // should be mipoffset[1] + image_width*image_height/4 + mipoffset[3] = MSG_ReadLittleLong(sb); // should be mipoffset[2] + image_width*image_height/16 + pal = sb->data + mipoffset[3] + (image_width / 8 * image_height / 8) + 2; + + // bail if any data looks wrong + if (image_width < 0 + || image_width > 4096 + || image_height < 0 + || image_height > 4096 + || mipoffset[0] != 40 + || mipoffset[1] != mipoffset[0] + image_width * image_height + || mipoffset[2] != mipoffset[1] + image_width / 2 * image_height / 2 + || mipoffset[3] != mipoffset[2] + image_width / 4 * image_height / 4 + || (unsigned int)sb->cursize < (mipoffset[3] + image_width / 8 * image_height / 8 + 2 + 768)) + return NULL; + + in = (unsigned char *)sb->data + mipoffset[0]; + data = out = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4); if (!data) return NULL; - image_width = tex->width; - image_height = tex->height; - pal = in + (((image_width * image_height) * 85) >> 6); -// palsize = pal[1] * 0x100 + pal[0]; -// if (palsize >= 256) -// palsize = 256; - pal += 2; for (d = 0;d < image_width * image_height;d++) { p = *in++; - if (tex->name[0] == '{' && p == 255) + if (name[0] == '{' && p == 255) out[0] = out[1] = out[2] = out[3] = 0; else { p *= 3; - out[0] = pal[p]; + out[2] = pal[p]; out[1] = pal[p+1]; - out[2] = pal[p+2]; + out[0] = pal[p+2]; out[3] = 255; } out += 4; @@ -299,101 +274,45 @@ qbyte *W_ConvertWAD3Texture(miptex_t *tex) return data; } -qbyte *W_GetTexture(char *name) +unsigned char *W_GetTextureBGRA(char *name) { -// int i, c, datasize; -// short colorcount; -// qbyte pal[256][3], *indata, *outdata, *data; + unsigned int i, k; + sizebuf_t sb; + unsigned char *data; + mwad_t *w; char texname[17]; - int i, j; - QFile *file; - miptex_t *tex; - qbyte *data; + size_t range; + texname[16] = 0; - W_CleanupName (name, texname); - for (i = 0;i < TEXWAD_MAXIMAGES;i++) + W_CleanupName(name, texname); + if (!wad.hlwads.mempool) + Mem_ExpandableArray_NewArray(&wad.hlwads, cls.permanentmempool, sizeof(mwad_t), 16); + range = Mem_ExpandableArray_IndexRange(&wad.hlwads); + for (k = 0;k < range;k++) { - if (texwadlump[i].name[0]) + w = (mwad_t *)Mem_ExpandableArray_RecordAtIndex(&wad.hlwads, k); + if (!w) + continue; + for (i = 0;i < (unsigned int)w->numlumps;i++) { - if (!strcmp(texname, texwadlump[i].name)) // found it + if (!strcmp(texname, w->lumps[i].name)) // found it { - file = texwadlump[i].file; - if (Qseek(file, texwadlump[i].position, SEEK_SET)) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;} + if (FS_Seek(w->file, w->lumps[i].filepos, SEEK_SET)) + {Con_Print("W_GetTexture: corrupt WAD3 file\n");return NULL;} - tex = Mem_Alloc(tempmempool, texwadlump[i].size); - if (!tex) + MSG_InitReadBuffer(&sb, (unsigned char *)Mem_Alloc(tempmempool, w->lumps[i].disksize), w->lumps[i].disksize); + if (!sb.data) return NULL; - if (Qread(file, tex, texwadlump[i].size) < texwadlump[i].size) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;} - - tex->width = LittleLong(tex->width); - tex->height = LittleLong(tex->height); - for (j = 0;j < MIPLEVELS;j++) - tex->offsets[j] = LittleLong(tex->offsets[j]); - data = W_ConvertWAD3Texture(tex); - Mem_Free(tex); - return data; - /* - image_width = LittleLong(t.width); - image_height = LittleLong(t.height); - if (matchwidth && image_width != matchwidth) - continue; - if (matchheight && image_height != matchheight) - continue; - if (image_width & 15 || image_height & 15) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;} - // allocate space for expanded image, - // and load incoming image into upper area (overwritten as it expands) - if (!(data = outdata = Mem_Alloc(tempmempool, image_width*image_height*4))) - {Con_Printf("W_GetTexture: out of memory");return NULL;} - indata = outdata + image_width*image_height*3; - datasize = image_width*image_height*85/64; - // read the image data - if (Qseek(file, texwadlump[i].position + sizeof(t), SEEK_SET)) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;} - if (Qread(file, indata, image_width*image_height) != image_width*image_height) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;} - // read the number of colors used (always 256) - if (Qseek(file, texwadlump[i].position + sizeof(t) + datasize, SEEK_SET)) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;} - if (Qread(file, &colorcount, 2) != 2) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;} - if (texwadlump[i].size > (datasize + sizeof(t))) - { - colorcount = LittleShort(colorcount); - // sanity checking - if (colorcount < 0) colorcount = 0; - if (colorcount > 256) colorcount = 256; - // read the palette - // Qseek(file, texwadlump[i].position + sizeof(t) + datasize + 2, SEEK_SET); - if (Qread(file, &pal, 3 * colorcount) != 3 * colorcount) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;} - } - else - memcpy(&pal, hlpalette, 768); - // expand the image to 32bit RGBA - for (i = 0;i < image_width*image_height;i++) - { - c = *indata++; - if (name[0] == '{' && c == 255) - outdata[0] = outdata[1] = outdata[2] = outdata[3] = 0; - else - { - outdata[0] = pal[c][0]; - outdata[1] = pal[c][1]; - outdata[2] = pal[c][2]; - outdata[3] = 255; - } - outdata += 4; - } + if (FS_Read(w->file, sb.data, w->lumps[i].size) < w->lumps[i].disksize) + {Con_Print("W_GetTexture: corrupt WAD3 file\n");return NULL;} + + data = W_ConvertWAD3TextureBGRA(&sb); + Mem_Free(sb.data); return data; - */ } } - else - break; } image_width = image_height = 0; return NULL; } +