qbsp: add support for WAD3 texture wad format

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>

changelog.txt

@@ -1,5 +1,6 @@
 Unreleased
 
+* qbsp: added support for using WAD3 texture wads used by Hammer
 * light: implemented self shadowing and full shadows for brush models
 * light: removed the "-nominlimit" option (now the default behaviour)
 * light: remove support for negative color components (never worked properly)

qbsp/wad.c

@@ -30,24 +30,49 @@ static int WAD_LoadLump(wad_t *w, char *name, byte *dest);
 
 
 static bool
-WAD_LoadInfo(wad_t *w)
+WAD_LoadInfo(wad_t *wad)
 {
-    wadinfo_t *hdr = &w->header;
+    wadinfo_t *hdr = &wad->header;
-    bool ret = false;
+    int i, len, lumpinfosize, disksize;
-    int len;
+    dmiptex_t miptex;
 
-    len = fread(hdr, 1, sizeof(wadinfo_t), w->file);
+    len = fread(hdr, 1, sizeof(wadinfo_t), wad->file);
-    if (len == sizeof(wadinfo_t))
+    if (len != sizeof(wadinfo_t))
-	if (!strncmp(hdr->identification, "WAD2", 4)) {
+	return false;
-	    const int lumpinfo = sizeof(lumpinfo_t) * hdr->numlumps;
-	    fseek(w->file, hdr->infotableofs, SEEK_SET);
-	    w->lumps = AllocMem(OTHER, lumpinfo, true);
-	    len = fread(w->lumps, 1, lumpinfo, w->file);
-	    if (len == lumpinfo)
-		ret = true;
-	}
 
-    return ret;
+    wad->version = 0;
+    if (!strncmp(hdr->identification, "WAD2", 4))
+	wad->version = 2;
+    else if (!strncmp(hdr->identification, "WAD3", 4))
+	wad->version = 3;
+    if (!wad->version)
+	return false;
+
+    lumpinfosize = sizeof(lumpinfo_t) * hdr->numlumps;
+    fseek(wad->file, hdr->infotableofs, SEEK_SET);
+    wad->lumps = AllocMem(OTHER, lumpinfosize, true);
+    len = fread(wad->lumps, 1, lumpinfosize, wad->file);
+    if (len != lumpinfosize)
+	return false;
+
+    if (wad->version == 2)
+	return true;
+
+    /*
+     * WAD3 format includes a palette after the mipmap data.
+     * Reduce the disksize in the lumpinfo so we can treat it like WAD2.
+     */
+    for (i = 0; i < wad->header.numlumps; i++) {
+	fseek(wad->file, wad->lumps[i].filepos, SEEK_SET);
+	len = fread(&miptex, 1, sizeof(miptex), wad->file);
+	if (len != sizeof(miptex))
+	    return false;
+	disksize = miptex.width * miptex.height / 64 * 85;
+	if (disksize < wad->lumps[i].disksize)
+	    wad->lumps[i].disksize = disksize;
+    }
+
+    return true;
 }
 
 

qbsp/wad.h

@@ -40,8 +40,16 @@ typedef struct {
     char name[16];		// must be null terminated
 } lumpinfo_t;
 
+#define MIPLEVELS 4
+typedef struct {
+    char name[16];
+    uint32_t width, height;
+    uint32_t offsets[MIPLEVELS];
+} dmiptex_t;
+
 typedef struct {
     wadinfo_t header;
+    int version;
     lumpinfo_t *lumps;
     FILE *file;
 } wad_t;