This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-// wad.c
+
#include "quakedef.h"
+#include "image.h"
+#include "wad.h"
-int wad_numlumps;
-lumpinfo_t *wad_lumps;
-byte *wad_base;
+typedef struct mwad_s
+{
+ qfile_t *file;
+ int numlumps;
+ lumpinfo_t *lumps;
+}
+mwad_t;
-void SwapPic (qpic_t *pic);
+typedef struct wadstate_s
+{
+ unsigned char *gfx_base;
+ mwad_t gfx;
+ memexpandablearray_t hlwads;
+}
+wadstate_t;
+
+static wadstate_t wad;
/*
==================
Can safely be performed in place.
==================
*/
-void W_CleanupName (char *in, char *out)
+static void W_CleanupName (const char *in, char *out)
{
int i;
int c;
-
+
for (i=0 ; i<16 ; i++ )
{
c = in[i];
if (!c)
break;
-
+
if (c >= 'A' && c <= 'Z')
c += ('a' - 'A');
out[i] = c;
}
-
+
for ( ; i< 16 ; i++ )
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;
-
- wad_base = COM_LoadHunkFile (filename, false);
- if (!wad_base)
- Sys_Error ("W_LoadWadFile: couldn't load %s", filename);
-
- header = (wadinfo_t *)wad_base;
-
- if (header->identification[0] != 'W'
- || header->identification[1] != 'A'
- || header->identification[2] != 'D'
- || header->identification[3] != '2')
- 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);
-
- for (i=0, lump_p = wad_lumps ; i<wad_numlumps ; i++,lump_p++)
+ int i;
+ for (i = 0;i < numlumps;i++)
{
- lump_p->filepos = 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));
+ 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);
}
}
-
-/*
-=============
-W_GetLumpinfo
-=============
-*/
-lumpinfo_t *W_GetLumpinfo (char *name)
+void W_UnloadAll(void)
{
- int i;
- lumpinfo_t *lump_p;
- char clean[16];
-
- W_CleanupName (name, clean);
-
- for (lump_p=wad_lumps, i=0 ; i<wad_numlumps ; i++,lump_p++)
+ unsigned int i;
+ mwad_t *w;
+ // free gfx.wad if it is loaded
+ if (wad.gfx_base)
+ Mem_Free(wad.gfx_base);
+ wad.gfx_base = NULL;
+ // close all hlwad files and free their lumps data
+ for (i = 0;i < Mem_ExpandableArray_IndexRange(&wad.hlwads);i++)
{
- if (!strcmp(clean, lump_p->name))
- return lump_p;
+ 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;
}
-
- Sys_Error ("W_GetLumpinfo: %s not found", name);
- return 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)
{
- lumpinfo_t *lump;
-
- lump = W_GetLumpinfo (name);
-
- return (void *)(wad_base + lump->filepos);
-}
+ int i;
+ fs_offset_t filesize;
+ lumpinfo_t *lump;
+ char clean[16];
+ wadinfo_t *header;
+ int infotableofs;
-void *W_GetLumpNum (int num)
-{
- lumpinfo_t *lump;
-
- if (num < 0 || num > wad_numlumps)
- Sys_Error ("W_GetLumpNum: bad number: %i", num);
-
- lump = wad_lumps + num;
-
- return (void *)(wad_base + lump->filepos);
-}
-
-/*
-=============================================================================
+ W_CleanupName (name, clean);
-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;
-
-texwadlump_t texwadlump[TEXWAD_MAXIMAGES];
-
/*
====================
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;
-
- COM_FOpenFile (filename, &file, false, false);
+ mwad_t *w;
+
+ file = FS_OpenVirtualFile(filename, false);
if (!file)
{
if (complain)
- Con_Printf ("W_LoadTextureWadFile: couldn't find %s", filename);
+ Con_Printf("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(header.identification[0] != 'W'
- || header.identification[1] != 'A'
- || header.identification[2] != 'D'
- || header.identification[3] != '3')
- {Con_Printf ("W_LoadTextureWadFile: Wad file %s doesn't have WAD3 id\n",filename);return;}
+ if (FS_Read(file, &header, sizeof(wadinfo_t)) != sizeof(wadinfo_t))
+ {Con_Print("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);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("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 = qmalloc(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("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 ; i<numlumps ; i++,lump_p++)
+ if (!w->lumps)
{
- 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("W_LoadTextureWadFile: unable to allocate temporary memory for lump table\n");
+ FS_Close(w->file);
+ w->file = NULL;
+ w->numlumps = 0;
+ return;
}
- qfree(lumps);
+
+ if (FS_Read(file, w->lumps, sizeof(lumpinfo_t) * w->numlumps) != (fs_offset_t)sizeof(lumpinfo_t) * numlumps)
+ {
+ Con_Print("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
}
-/*
-byte 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,
-};
-*/
-
-byte *W_ConvertWAD3Texture(miptex_t *tex)
+unsigned char *W_ConvertWAD3TextureBGRA(sizebuf_t *sb)
{
- byte *in, *data, *out, *pal;
-// int palsize;
+ unsigned char *in, *data, *out, *pal;
int d, p;
- in = (byte *)((int) tex + tex->offsets[0]);
- data = out = qmalloc(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;
return data;
}
-byte *W_GetTexture(char *name)
+unsigned char *W_GetTextureBGRA(char *name)
{
-// int i, c, datasize;
-// short colorcount;
-// byte 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;
- byte *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 = qmalloc(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);
- qfree(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 = qmalloc(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;
}
+
projects / xonotic / darkplaces.git / blobdiff