X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=wad.c;h=12978f383a6b8969343bb543c0e3df60cca91c2b;hp=4414197f2fcb5831599b02f73d76602601b79105;hb=c0b28902ae728d6089484e8f205aa118cd5b525b;hpb=c4ee1bbcc6b2f917465f07269ad09942bbf40849 diff --git a/wad.c b/wad.c index 4414197f..12978f38 100644 --- a/wad.c +++ b/wad.c @@ -17,16 +17,12 @@ 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" -static int wad_numlumps; -static lumpinfo_t *wad_lumps; -static qbyte *wad_base = NULL; -static mempool_t *wad_mempool = NULL; +#include "quakedef.h" +#include "image.h" +#include "wad.h" -void SwapPic (qpic_t *pic); /* ================== @@ -39,7 +35,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,65 +55,56 @@ static void W_CleanupName (char *in, char *out) out[i] = 0; } +static int wad_numlumps = 0; +static lumpinfo_t *wad_lumps = NULL; +static unsigned char *wad_base = NULL; - -/* -==================== -W_LoadWadFile -==================== -*/ -void W_LoadWadFile (char *filename) +unsigned char *W_GetLumpName(const char *name) { - 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); + int i; + fs_offset_t filesize; + lumpinfo_t *lump; + char clean[16]; + wadinfo_t *header; + int infotableofs; - 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); + W_CleanupName (name, clean); - 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)); - } -} - -void *W_GetLumpName (char *name) -{ - int i; - lumpinfo_t *lump; - char clean[16]; + if ((wad_base = FS_LoadFile ("gfx.wad", cls.permanentmempool, false, &filesize))) + { + if (memcmp(wad_base, "WAD2", 4)) + { + Con_Print("gfx.wad doesn't have WAD2 id\n"); + Mem_Free(wad_base); + wad_base = NULL; + } + else + { + header = (wadinfo_t *)wad_base; + wad_numlumps = LittleLong(header->numlumps); + infotableofs = LittleLong(header->infotableofs); + wad_lumps = (lumpinfo_t *)(wad_base + infotableofs); - W_CleanupName (name, clean); + for (i=0, lump = wad_lumps ; ifilepos = LittleLong(lump->filepos); + lump->size = LittleLong(lump->size); + W_CleanupName (lump->name, lump->name); + } + } + } + } for (lump = wad_lumps, i = 0;i < wad_numlumps;i++, lump++) if (!strcmp(clean, lump->name)) - return (void *)(wad_base + lump->filepos); + return (wad_base + lump->filepos); - //Sys_Error ("W_GetLumpinfo: %s not found", name); + if (wad_base) + Con_DPrintf("W_GetLumpByName(\"%s\"): couldn't find file in gfx.wad\n", name); + else + Con_DPrintf("W_GetLumpByName(\"%s\"): couldn't load gfx.wad\n", name); return NULL; } @@ -129,18 +116,12 @@ automatic byte swapping ============================================================================= */ -void SwapPic (qpic_t *pic) -{ - pic->width = LittleLong(pic->width); - pic->height = LittleLong(pic->height); -} - // LordHavoc: added alternate WAD2/WAD3 system for HalfLife texture wads #define TEXWAD_MAXIMAGES 16384 -typedef struct +typedef struct texwadlump_s { char name[16]; - QFile *file; + qfile_t *file; int position; int size; } texwadlump_t; @@ -156,36 +137,36 @@ void W_LoadTextureWadFile (char *filename, int complain) { lumpinfo_t *lumps, *lump_p; wadinfo_t header; - unsigned i, j; + int i, j; int infotableofs; - QFile *file; + qfile_t *file; int numlumps; - COM_FOpenFile (filename, &file, false, false); + file = FS_Open (filename, "rb", false, 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 (FS_Read(file, &header, sizeof(wadinfo_t)) != sizeof(wadinfo_t)) + {Con_Print("W_LoadTextureWadFile: unable to read wad header\n");return;} if(memcmp(header.identification, "WAD3", 4)) - {Con_Printf ("W_LoadTextureWadFile: Wad file %s doesn't have WAD3 id\n",filename);return;} + {Con_Printf("W_LoadTextureWadFile: Wad file %s doesn't have WAD3 id\n",filename);return;} numlumps = LittleLong(header.numlumps); if (numlumps < 1 || numlumps > TEXWAD_MAXIMAGES) - {Con_Printf ("W_LoadTextureWadFile: invalid number of lumps (%i)\n", numlumps);return;} + {Con_Printf("W_LoadTextureWadFile: invalid number of lumps (%i)\n", numlumps);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("W_LoadTextureWadFile: unable to seek to lump table\n");return;} + 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 (Qread(file, lumps, sizeof(lumpinfo_t) * numlumps) != sizeof(lumpinfo_t) * numlumps) - {Con_Printf ("W_LoadTextureWadFile: unable to read lump table");return;} + 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 ; ioffsets[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; 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++) { @@ -299,16 +224,14 @@ qbyte *W_ConvertWAD3Texture(miptex_t *tex) return data; } -qbyte *W_GetTexture(char *name) +unsigned char *W_GetTexture(char *name) { -// int i, c, datasize; -// short colorcount; -// qbyte pal[256][3], *indata, *outdata, *data; char texname[17]; int i, j; - QFile *file; + qfile_t *file; miptex_t *tex; - qbyte *data; + unsigned char *data; + texname[16] = 0; W_CleanupName (name, texname); for (i = 0;i < TEXWAD_MAXIMAGES;i++) @@ -318,14 +241,14 @@ qbyte *W_GetTexture(char *name) if (!strcmp(texname, texwadlump[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(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 (Qread(file, tex, texwadlump[i].size) < texwadlump[i].size) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;} + 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); tex->height = LittleLong(tex->height); @@ -334,61 +257,6 @@ qbyte *W_GetTexture(char *name) 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; - } - return data; - */ } } else @@ -397,3 +265,4 @@ qbyte *W_GetTexture(char *name) image_width = image_height = 0; return NULL; } +