X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=wad.c;h=027dec1a858ef87c7b53e942752ce2a39a8a7411;hp=e5b53c353b39341b0e725f37316d016754b62052;hb=6824d8ddc8a43cae0609be5bbe8bee01fa1a4225;hpb=57252d1b300d96b2353bf9d564b0de281552d2c5 diff --git a/wad.c b/wad.c index e5b53c35..027dec1a 100644 --- a/wad.c +++ b/wad.c @@ -17,17 +17,16 @@ 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; void SwapPic (qpic_t *pic); + /* ================== W_CleanupName @@ -39,7 +38,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,64 +58,60 @@ static void W_CleanupName (char *in, char *out) out[i] = 0; } - - -/* -==================== -W_LoadWadFile -==================== -*/ -void W_LoadWadFile (char *filename) +void *W_GetLumpName(const char *name) { - lumpinfo_t *lump_p; - wadinfo_t *header; - int i; - int infotableofs; - void *temp; - - temp = FS_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, fs_filesize); - - memcpy(wad_base, temp, fs_filesize); - Mem_Free(temp); - - header = (wadinfo_t *)wad_base; + int i; + lumpinfo_t *lump; + char clean[16]; + wadinfo_t *header; + int infotableofs; + void *temp; + static int wad_loaded = false; + static int wad_numlumps = 0; + static lumpinfo_t *wad_lumps = NULL; + static unsigned char *wad_base = NULL; - 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)); + wad_loaded = true; + if ((temp = FS_LoadFile ("gfx.wad", tempmempool, false))) + { + if (memcmp(temp, "WAD2", 4)) + Con_Print("gfx.wad doesn't have WAD2 id\n"); + else + { + wad_base = (unsigned char *)Mem_Alloc(cl_mempool, fs_filesize); + + memcpy(wad_base, temp, fs_filesize); + Mem_Free(temp); + + header = (wadinfo_t *)wad_base; + wad_numlumps = LittleLong(header->numlumps); + infotableofs = LittleLong(header->infotableofs); + wad_lumps = (lumpinfo_t *)(wad_base + infotableofs); + + for (i=0, lump = wad_lumps ; ifilepos = LittleLong(lump->filepos); + lump->size = LittleLong(lump->size); + W_CleanupName (lump->name, lump->name); + if (lump->type == TYP_QPIC) + SwapPic ( (qpic_t *)(wad_base + lump->filepos)); + } + } + } } -} - -void *W_GetLumpName (char *name) -{ - int i; - lumpinfo_t *lump; - char clean[16]; - - 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); + 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; } @@ -136,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; @@ -160,31 +155,31 @@ void W_LoadTextureWadFile (char *filename, int complain) qfile_t *file; int numlumps; - file = FS_Open (filename, "rb", 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 (FS_Read(file, &header, sizeof(wadinfo_t)) != sizeof(wadinfo_t)) - {Con_Printf ("W_LoadTextureWadFile: unable to read wad header");return;} + {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 (FS_Seek (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;} + {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 (FS_Read(file, lumps, sizeof(lumpinfo_t) * numlumps) != (int)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; @@ -242,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); @@ -260,13 +255,13 @@ qbyte *W_GetTexture(char *name) { file = texwadlump[i].file; if (FS_Seek(file, texwadlump[i].position, SEEK_SET)) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;} + {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) - {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;} + {Con_Print("W_GetTexture: corrupt WAD3 file\n");return NULL;} tex->width = LittleLong(tex->width); tex->height = LittleLong(tex->height);