OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added initial support for a GAMEINFO lump in PWADs. When the game is started

Browse source 
all files loaded with '-file' are scanned for this lump. This lump is read
  before any WAD initialization takes place, in particular the IWAD is not yet
  loaded at this time. This allows PWADs the option to specify an IWAD they 
  want to run with and optionally autoload external resource WADs.
- Fixed a few places where FixPathSeperator was called with a locked FString buffer.
  It's better to use the FString version of this function instead.


SVN r2073 (trunk)
This commit is contained in:
Christoph Oelckers 2010-01-01 15:31:00 +00:00
commit 90ea0c3f6f
6 changed files with 145 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/d_iwad.cpp
View file

@ -446,8 +446,7 @@ static int CheckIWAD (const char *doomwaddir, WadStuff *wads)
FString iwad;
iwad.Format ("%s%s%s", doomwaddir, slash, IWADNames[i]);
FixPathSeperator (iwad.LockBuffer());
iwad.UnlockBuffer();
FixPathSeperator (iwad);
if (FileExists (iwad))
{
wads[i].Type = ScanIWAD (iwad);
@ -484,7 +483,7 @@ static int CheckIWAD (const char *doomwaddir, WadStuff *wads)
//
//==========================================================================
static EIWADType IdentifyVersion (TArray<FString> &wadfiles, const char *zdoom_wad)
static EIWADType IdentifyVersion (TArray<FString> &wadfiles, const char *iwad, const char *zdoom_wad)
{
WadStuff wads[countof(IWADNames)];
size_t foundwads[NUM_IWAD_TYPES] = { 0 };
@ -495,10 +494,15 @@ static EIWADType IdentifyVersion (TArray<FString> &wadfiles, const char *zdoom_w
bool iwadparmfound = false;
FString custwad;
if (iwadparm == NULL && iwad != NULL && *iwad != 0)
{
iwadparm = iwad;
}
if (iwadparm)
{
custwad = iwadparm;
FixPathSeperator (custwad.LockBuffer());
FixPathSeperator (custwad);
if (CheckIWAD (custwad, wads))
{ // -iwad parameter was a directory
iwadparm = NULL;
@ -524,8 +528,7 @@ static EIWADType IdentifyVersion (TArray<FString> &wadfiles, const char *zdoom_w
if (stricmp (key, "Path") == 0)
{
FString nice = NicePath(value);
FixPathSeperator(nice.LockBuffer());
nice.UnlockBuffer();
FixPathSeperator(nice);
CheckIWAD(nice, wads);
}
}
@ -660,9 +663,9 @@ static EIWADType IdentifyVersion (TArray<FString> &wadfiles, const char *zdoom_w
}
const IWADInfo *D_FindIWAD(TArray<FString> &wadfiles, const char *basewad)
const IWADInfo *D_FindIWAD(TArray<FString> &wadfiles, const char *iwad, const char *basewad)
{
EIWADType iwadType = IdentifyVersion(wadfiles, basewad);
EIWADType iwadType = IdentifyVersion(wadfiles, iwad, basewad);
gameiwad = iwadType;
const IWADInfo *iwad_info = &IWADInfos[iwadType];
I_SetIWADInfo(iwad_info);