OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- replaced wadlist_t with an array of FStrings and added a list parameter to

Browse source 
everything that eventually calls D_AddFile. Also create the list of files
  loaded on the command line separately to allow further checks on them.


SVN r2072 (trunk)
This commit is contained in:
Christoph Oelckers 2010-01-01 12:40:47 +00:00
commit 370eff9014
7 changed files with 93 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/d_iwad.cpp
View file

@ -484,7 +484,7 @@ static int CheckIWAD (const char *doomwaddir, WadStuff *wads)
//
//==========================================================================
static EIWADType IdentifyVersion (const char *zdoom_wad)
static EIWADType IdentifyVersion (TArray<FString> &wadfiles, const char *zdoom_wad)
{
WadStuff wads[countof(IWADNames)];
size_t foundwads[NUM_IWAD_TYPES] = { 0 };
@ -630,14 +630,14 @@ static EIWADType IdentifyVersion (const char *zdoom_wad)
exit (0);
// zdoom.pk3 must always be the first file loaded and the IWAD second.
D_AddFile (zdoom_wad);
D_AddFile (wadfiles, zdoom_wad);
if (wads[pickwad].Type == IWAD_HexenDK)
{ // load hexen.wad before loading hexdd.wad
D_AddFile (wads[foundwads[IWAD_Hexen]-1].Path);
D_AddFile (wadfiles, wads[foundwads[IWAD_Hexen]-1].Path);
}
D_AddFile (wads[pickwad].Path);
D_AddFile (wadfiles, wads[pickwad].Path);
if (wads[pickwad].Type == IWAD_Strife)
{ // Try to load voices.wad along with strife1.wad
@ -653,16 +653,16 @@ static EIWADType IdentifyVersion (const char *zdoom_wad)
path = FString (wads[pickwad].Path.GetChars(), lastslash + 1);
}
path += "voices.wad";
D_AddFile (path);
D_AddFile (wadfiles, path);
}
return wads[pickwad].Type;
}
const IWADInfo *D_FindIWAD(const char *basewad)
const IWADInfo *D_FindIWAD(TArray<FString> &wadfiles, const char *basewad)
{
EIWADType iwadType = IdentifyVersion(basewad);
EIWADType iwadType = IdentifyVersion(wadfiles, basewad);
gameiwad = iwadType;
const IWADInfo *iwad_info = &IWADInfos[iwadType];
I_SetIWADInfo(iwad_info);