From bba30bcc2eac029cb5a8322110781909b88fe9c8 Mon Sep 17 00:00:00 2001
From: Tyrann <tyrann@disenchant.net>
Date: Mon, 2 Oct 2006 09:30:27 +0930
Subject: [PATCH] [PATCH] qbsp: Remove unnecessary name field from wad_t

wad_t::name isn't required outside of some temporary usage in WAD_InitWadList
so doesn't really belong in the struct.

Signed-off-by: Tyrann <tyrann@disenchant.net>
---
 qbsp/wad.c | 7 ++++---
 qbsp/wad.h | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qbsp/wad.c b/qbsp/wad.c
index 97af3847..eec48120 100644
--- a/qbsp/wad.c
+++ b/qbsp/wad.c
@@ -59,6 +59,7 @@ WAD_InitWadList(wad_t *w, char *list)
     int i, len, ret;
     FILE *fileT;
     wadlist_t *wad, *tmp;
+    char *fname;
 
     if (!list)
 	return false;
@@ -82,20 +83,20 @@ WAD_InitWadList(wad_t *w, char *list)
     wad = w->wadlist;
     i = 0;
     while (i < len) {
-	w->name = list + i;
+	fname = list + i;
 	while (list[i] != 0 && list[i] != ';')
 	    i++;
 	list[i] = 0;
 	i++;
 
-	fileT = fopen(w->name, "rb");
+	fileT = fopen(fname, "rb");
 	if (fileT) {
 	    wad->Wad = fileT;
 	    ret = fread(&wad->header, 1, sizeof(wadinfo_t), fileT);
 	    if (ret != sizeof(wadinfo_t))
 		Message(msgError, errReadFailure);
 	    if (strncmp(wad->header.identification, "WAD2", 4)) {
-		Message(msgWarning, warnNotWad, w->name);
+		Message(msgWarning, warnNotWad, fname);
 		fclose(fileT);
 	    } else {
 		fseek(fileT, wad->header.infotableofs, SEEK_SET);
diff --git a/qbsp/wad.h b/qbsp/wad.h
index ffdbf6e3..70401ffa 100644
--- a/qbsp/wad.h
+++ b/qbsp/wad.h
@@ -47,7 +47,6 @@ typedef struct {
 } wadlist_t;
 
 typedef struct {
-    char *name;
     wadlist_t *wadlist;
     int numwads;
 } wad_t;