X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=wad.c;h=755ae5e6662319245c3c805fb9f33007eecbcabe;hp=48c581144b4819a61c1db1d2296c89d2a2dd7ae8;hb=9ed3f50e7c5d1db79d6258145329f31619617e6a;hpb=8dcce44300385b12c46d494c06aadcfa35a8bc14 diff --git a/wad.c b/wad.c index 48c58114..755ae5e6 100644 --- a/wad.c +++ b/wad.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. 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. @@ -21,9 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -int wad_numlumps; -lumpinfo_t *wad_lumps; -byte *wad_base; +static int wad_numlumps; +static lumpinfo_t *wad_lumps; +static qbyte *wad_base = NULL; +static mempool_t *wad_mempool = NULL; void SwapPic (qpic_t *pic); @@ -38,22 +39,22 @@ Space padding is so names can be printed nicely in tables. Can safely be performed in place. ================== */ -void W_CleanupName (char *in, char *out) +static void W_CleanupName (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; } @@ -69,25 +70,31 @@ void W_LoadWadFile (char *filename) { lumpinfo_t *lump_p; wadinfo_t *header; - unsigned i; + int i; int infotableofs; - - wad_base = COM_LoadHunkFile (filename, false); - if (!wad_base) + 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 (header->identification[0] != 'W' - || header->identification[1] != 'A' - || header->identification[2] != 'D' - || header->identification[3] != '2') + + 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); - + for (i=0, lump_p = wad_lumps ; ifilepos = LittleLong(lump_p->filepos); @@ -98,49 +105,19 @@ void W_LoadWadFile (char *filename) } } - -/* -============= -W_GetLumpinfo -============= -*/ -lumpinfo_t *W_GetLumpinfo (char *name) +void *W_GetLumpName (char *name) { int i; - lumpinfo_t *lump_p; + lumpinfo_t *lump; char clean[16]; - + W_CleanupName (name, clean); - - for (lump_p=wad_lumps, i=0 ; iname)) - return lump_p; - } - - Sys_Error ("W_GetLumpinfo: %s not found", name); - return NULL; -} -void *W_GetLumpName (char *name) -{ - lumpinfo_t *lump; - - lump = W_GetLumpinfo (name); - - return (void *)(wad_base + lump->filepos); -} + for (lump = wad_lumps, i = 0;i < wad_numlumps;i++, lump++) + if (!strcmp(clean, lump->name)) + return (void *)(wad_base + lump->filepos); -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); + return NULL; } /* @@ -154,20 +131,20 @@ automatic byte swapping void SwapPic (qpic_t *pic) { pic->width = LittleLong(pic->width); - pic->height = LittleLong(pic->height); + pic->height = LittleLong(pic->height); } // LordHavoc: added alternate WAD2/WAD3 system for HalfLife texture wads -#define TEXWAD_MAXIMAGES 8192 +#define TEXWAD_MAXIMAGES 16384 typedef struct { char name[16]; - FILE *file; + QFile *file; int position; int size; } texwadlump_t; -texwadlump_t texwadlump[TEXWAD_MAXIMAGES]; +static texwadlump_t texwadlump[TEXWAD_MAXIMAGES]; /* ==================== @@ -178,12 +155,12 @@ void W_LoadTextureWadFile (char *filename, int complain) { lumpinfo_t *lumps, *lump_p; wadinfo_t header; - unsigned i, j; + int i, j; int infotableofs; - FILE *file; + QFile *file; int numlumps; - - COM_FOpenFile (filename, &file, false); + + COM_FOpenFile (filename, &file, false, false); if (!file) { if (complain) @@ -191,27 +168,24 @@ void W_LoadTextureWadFile (char *filename, int complain) return; } - if (fread(&header, sizeof(wadinfo_t), 1, file) != 1) + 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') + + if(memcmp(header.identification, "WAD3", 4)) {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;} infotableofs = LittleLong(header.infotableofs); - if (fseek(file, infotableofs, SEEK_SET)) + if (Qseek(file, infotableofs, SEEK_SET)) {Con_Printf ("W_LoadTextureWadFile: unable to seek to lump table");return;} - if (!(lumps = malloc(sizeof(lumpinfo_t)*numlumps))) + if (!(lumps = Mem_Alloc(tempmempool, sizeof(lumpinfo_t)*numlumps))) {Con_Printf ("W_LoadTextureWadFile: unable to allocate temporary memory for lump table");return;} - if (fread(lumps, sizeof(lumpinfo_t), numlumps, file) != numlumps) + if (Qread(file, lumps, sizeof(lumpinfo_t) * numlumps) != (int)sizeof(lumpinfo_t) * numlumps) {Con_Printf ("W_LoadTextureWadFile: unable to read lump table");return;} - + for (i=0, lump_p = lumps ; iname, lump_p->name); @@ -232,143 +206,74 @@ void W_LoadTextureWadFile (char *filename, int complain) texwadlump[j].position = LittleLong(lump_p->filepos); texwadlump[j].size = LittleLong(lump_p->disksize); } - free(lumps); + Mem_Free(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_GetTexture(char *name, int matchwidth, int matchheight) +qbyte *W_ConvertWAD3Texture(miptex_t *tex) { - int i, c, datasize; - short colorcount; - FILE *file; - struct + qbyte *in, *data, *out, *pal; + int d, p; + + in = (qbyte *)((int) tex + tex->offsets[0]); + data = out = 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); + pal += 2; + for (d = 0;d < image_width * image_height;d++) { - char name[16]; - int width; - int height; - int ofs[4]; - } t; - byte pal[256][3], *indata, *outdata, *data; + p = *in++; + if (tex->name[0] == '{' && p == 255) + out[0] = out[1] = out[2] = out[3] = 0; + else + { + p *= 3; + out[0] = pal[p]; + out[1] = pal[p+1]; + out[2] = pal[p+2]; + out[3] = 255; + } + out += 4; + } + return data; +} + +qbyte *W_GetTexture(char *name) +{ + char texname[17]; + int i, j; + QFile *file; + miptex_t *tex; + qbyte *data; + + texname[16] = 0; + W_CleanupName (name, texname); for (i = 0;i < TEXWAD_MAXIMAGES;i++) { if (texwadlump[i].name[0]) { - if (!strcmp(name, texwadlump[i].name)) // found it + if (!strcmp(texname, texwadlump[i].name)) // found it { file = texwadlump[i].file; - if (fseek(file, texwadlump[i].position, SEEK_SET)) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;} - if (fread(&t, sizeof(t), 1, file) != 1) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;} - 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 FALSE;} - // allocate space for expanded image, - // and load incoming image into upper area (overwritten as it expands) - if (!(data = outdata = malloc(image_width*image_height*4))) - {Con_Printf("W_GetTexture: out of memory");return FALSE;} - indata = outdata + image_width*image_height*3; - datasize = image_width*image_height*85/64; - // read the image data - if (fseek(file, texwadlump[i].position + sizeof(t), SEEK_SET)) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;} - if (fread(indata, 1, image_width*image_height, file) != image_width*image_height) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;} - // read the number of colors used (always 256) - if (fseek(file, texwadlump[i].position + sizeof(t) + datasize, SEEK_SET)) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;} - if (fread(&colorcount, 2, 1, file) != 1) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;} - 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 - // fseek(file, texwadlump[i].position + sizeof(t) + datasize + 2, SEEK_SET); - if (fread(&pal, 3, colorcount, file) != colorcount) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;} - } - else - memcpy(&pal, hlpalette, 768); - // expand the image to 32bit RGBA - for (i = 0;i < image_width*image_height;i++) - { - c = *indata++; - if (c == 255) // transparent color - { - *outdata++ = 0; - *outdata++ = 0; - *outdata++ = 0; - *outdata++ = 0; - } - else - { - *outdata++ = pal[c][0]; - *outdata++ = pal[c][1]; - *outdata++ = pal[c][2]; - *outdata++ = 255; - } - } + if (Qseek(file, texwadlump[i].position, SEEK_SET)) + {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;} + + tex = 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;} + + 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; } } @@ -378,3 +283,4 @@ byte *W_GetTexture(char *name, int matchwidth, int matchheight) image_width = image_height = 0; return NULL; } +