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: Load mapname.wad when no other wads available 

If the map has no wad key, or none of the wad files found in the key can be
loaded, then try loading mapname.wad as a default.

Signed-off-by: Tyrann <tyrann@disenchant.net>
This commit is contained in:
Tyrann 2006-10-02 13:39:42 +09:30
parent 60d1e22160
commit 6bb3ad326e
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
qbsp/qbsp.c
View File

@ -242,20 +242,33 @@ ProcessFile(void)
return; return;
} }
wads.numwads = 0;
wadstring = ValueForKey(0, "_wad"); wadstring = ValueForKey(0, "_wad");
if (!wadstring) { if (!wadstring)
wadstring = ValueForKey(0, "wad"); wadstring = ValueForKey(0, "wad");
if (!wadstring) { if (!wadstring)
Message(msgWarning, warnNoWadKey); Message(msgWarning, warnNoWadKey);
else
WADList_Init(&wads, wadstring);
if (!wads.numwads) {
if (wadstring)
Message(msgWarning, warnNoValidWads);
/* Try the default wad name */
wadstring = AllocMem(OTHER, strlen(options.szMapName) + 5, false);
strcpy(wadstring, options.szMapName);
StripExtension(wadstring);
DefaultExtension(wadstring, ".wad");
WADList_Init(&wads, wadstring);
if (wads.numwads)
Message(msgLiteral, "Using default WAD: %s\n", wadstring);
else
pWorldEnt->cTexdata = 0; pWorldEnt->cTexdata = 0;
} else { FreeMem(wadstring, OTHER, strlen(options.szMapName) + 5);
WADList_Init(&wads, wadstring);
if (!wads.numwads) {
Message(msgWarning, warnNoValidWads);
pWorldEnt->cTexdata = 0;
}
}
} }
if (!pWorldEnt->cTexdata)
// init the tables to be shared by all models // init the tables to be shared by all models
BeginBSPFile(); BeginBSPFile();