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

wad.cc: factor out .wad file opening

This commit is contained in:
Eric Wasylishen 2017-06-14 17:39:53 -06:00
parent c1a9b01c44
commit 8d2a257729
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qbsp/wad.hh
View File

@ -65,6 +65,7 @@ typedef struct wad_s {
struct wad_s *next; struct wad_s *next;
} wad_t; } wad_t;
wad_t *WADList_AddWad(const char *fpath, wad_t *current_wadlist);
wad_t *WADList_Init(const char *wadstring); wad_t *WADList_Init(const char *wadstring);
void WADList_Process(const wad_t *wadlist); void WADList_Process(const wad_t *wadlist);
void WADList_Free(wad_t *wadlist); void WADList_Free(wad_t *wadlist);

40
qbsp/wad.cc
View File

@ -96,6 +96,29 @@ WAD_LoadInfo(wad_t *wad)
return true; return true;
} }
wad_t *WADList_AddWad(const char *fpath, wad_t *current_wadlist)
{
wad_t wad = {0};
wad.file = fopen(fpath, "rb");
if (wad.file) {
if (options.fVerbose)
Message(msgLiteral, "Opened WAD: %s\n", fpath);
if (WAD_LoadInfo(&wad)) {
wad_t *newwad = (wad_t *)AllocMem(OTHER, sizeof(wad), true);
memcpy(newwad, &wad, sizeof(wad));
newwad->next = current_wadlist;
// FIXME: leaves file open?
return newwad;
} else {
Message(msgWarning, warnNotWad, fpath);
fclose(wad.file);
}
}
return current_wadlist;
}
wad_t * wad_t *
WADList_Init(const char *wadstring) WADList_Init(const char *wadstring)
@ -126,20 +149,9 @@ WADList_Init(const char *wadstring)
fpath = (char *)AllocMem(OTHER, pathlen + 1, true); fpath = (char *)AllocMem(OTHER, pathlen + 1, true);
q_snprintf(fpath, pathlen + 1, "%s/%s", options.wadPath, fname); q_snprintf(fpath, pathlen + 1, "%s/%s", options.wadPath, fname);
} }
wad.file = fopen(fpath, "rb");
if (wad.file) { wadlist = WADList_AddWad(fpath, wadlist);
if (options.fVerbose)
Message(msgLiteral, "Opened WAD: %s\n", fpath);
if (WAD_LoadInfo(&wad)) {
newwad = (wad_t *)AllocMem(OTHER, sizeof(wad), true);
memcpy(newwad, &wad, sizeof(wad));
newwad->next = wadlist;
wadlist = newwad;
} else {
Message(msgWarning, warnNotWad, fpath);
fclose(wad.file);
}
}
FreeMem(fpath, OTHER, strlen(fpath) + 1); FreeMem(fpath, OTHER, strlen(fpath) + 1);
pos++; pos++;
} }