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 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>
This commit is contained in:
Tyrann 2006-10-02 09:30:27 +09:30
parent c5b7fa7d2b
commit bba30bcc2e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qbsp/wad.c
View File

@ -59,6 +59,7 @@ WAD_InitWadList(wad_t *w, char *list)
int i, len, ret; int i, len, ret;
FILE *fileT; FILE *fileT;
wadlist_t *wad, *tmp; wadlist_t *wad, *tmp;
char *fname;
if (!list) if (!list)
return false; return false;
@ -82,20 +83,20 @@ WAD_InitWadList(wad_t *w, char *list)
wad = w->wadlist; wad = w->wadlist;
i = 0; i = 0;
while (i < len) { while (i < len) {
w->name = list + i; fname = list + i;
while (list[i] != 0 && list[i] != ';') while (list[i] != 0 && list[i] != ';')
i++; i++;
list[i] = 0; list[i] = 0;
i++; i++;
fileT = fopen(w->name, "rb"); fileT = fopen(fname, "rb");
if (fileT) { if (fileT) {
wad->Wad = fileT; wad->Wad = fileT;
ret = fread(&wad->header, 1, sizeof(wadinfo_t), fileT); ret = fread(&wad->header, 1, sizeof(wadinfo_t), fileT);
if (ret != sizeof(wadinfo_t)) if (ret != sizeof(wadinfo_t))
Message(msgError, errReadFailure); Message(msgError, errReadFailure);
if (strncmp(wad->header.identification, "WAD2", 4)) { if (strncmp(wad->header.identification, "WAD2", 4)) {
Message(msgWarning, warnNotWad, w->name); Message(msgWarning, warnNotWad, fname);
fclose(fileT); fclose(fileT);
} else { } else {
fseek(fileT, wad->header.infotableofs, SEEK_SET); fseek(fileT, wad->header.infotableofs, SEEK_SET);

1
qbsp/wad.h
View File

@ -47,7 +47,6 @@ typedef struct {
} wadlist_t; } wadlist_t;
typedef struct { typedef struct {
char *name;
wadlist_t *wadlist; wadlist_t *wadlist;
int numwads; int numwads;
} wad_t; } wad_t;