From 39d6337fe306643f11ff2230a2d68783053b71c7 Mon Sep 17 00:00:00 2001
From: Tyrann <tyrann@disenchant.net>
Date: Mon, 2 Oct 2006 14:08:58 +0930
Subject: [PATCH] [PATCH] qbsp: Remove numwads from wadlist_t

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

diff --git a/qbsp/wad.c b/qbsp/wad.c
index d83b6170..a9289a21 100644
--- a/qbsp/wad.c
+++ b/qbsp/wad.c
@@ -54,11 +54,11 @@ WAD_LoadInfo(wad_t *w)
 int
 WADList_Init(wadlist_t *list, char *wadstring)
 {
-    int i, len;
+    int i, len, numwads;
     wad_t *tmp, *w;
     char *fname;
 
-    list->numwads = 0;
+    numwads = 0;
     list->wads = NULL;
 
     if (!wadstring)
@@ -69,12 +69,12 @@ WADList_Init(wadlist_t *list, char *wadstring)
 	return 0;
 
     // Count # of wads
-    list->numwads = 1;
+    numwads = 1;
     for (i = 0; i < len; i++)
 	if (wadstring[i] == ';' && wadstring[i + 1] != ';')
-	    list->numwads++;
+	    numwads++;
 
-    tmp = AllocMem(OTHER, list->numwads * sizeof(wad_t), true);
+    tmp = AllocMem(OTHER, numwads * sizeof(wad_t), true);
 
     w = tmp;
     i = 0;
@@ -96,10 +96,10 @@ WADList_Init(wadlist_t *list, char *wadstring)
     /* Re-allocate just the required amount */
     list->wads = AllocMem(OTHER, (w - tmp) * sizeof(wad_t), false);
     memcpy(list->wads, tmp, (w - tmp) * sizeof(wad_t));
-    list->numwads = w - tmp;
-    FreeMem(tmp, OTHER, list->numwads * sizeof(wad_t));
+    FreeMem(tmp, OTHER, numwads * sizeof(wad_t));
+    numwads = w - tmp;
 
-    return list->numwads;
+    return numwads;
 }
 
 
diff --git a/qbsp/wad.h b/qbsp/wad.h
index a9c0c37e..f99a8f65 100644
--- a/qbsp/wad.h
+++ b/qbsp/wad.h
@@ -48,7 +48,6 @@ typedef struct {
 
 typedef struct {
     wad_t *wads;
-    int numwads;
 } wadlist_t;
 
 int WADList_Init(wadlist_t *list, char *wadstring);