olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] qbsp: Remove numwads from wadlist_t 

Signed-off-by: Tyrann <tyrann@disenchant.net>
This commit is contained in:
Tyrann 2006-10-02 14:08:58 +09:30
parent 582b3db593
commit 39d6337fe3
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qbsp/wad.c
View File

@ -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;
}

1
qbsp/wad.h
View File

@ -48,7 +48,6 @@ typedef struct {
typedef struct {
wad_t *wads;
int numwads;
} wadlist_t;
int WADList_Init(wadlist_t *list, char *wadstring);