OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added loading directories into the lump directory.

Browse source 
- fixed: The Dehacked parser could not parse flag values with the highest bit
  set because it used atoi to convert the string into a number.

SVN r1624 (trunk)
This commit is contained in:
Christoph Oelckers 2009-05-31 10:49:47 +00:00
commit 627838f379
13 changed files with 681 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/d_main.cpp
View file

@ -1182,14 +1182,14 @@ CCMD (endgame)
//
//==========================================================================
void D_AddFile (const char *file)
void D_AddFile (const char *file, bool check)
{
if (file == NULL)
{
return;
}
if (!FileExists (file))
if (check && !FileExists (file))
{
const char *f = BaseFileSearch (file, ".wad");
if (f == NULL)
@ -1702,8 +1702,11 @@ void D_DoomMain (void)
files2->Destroy();
files3->Destroy();
const char *loaddir = Args->CheckValue("-dir");
// FIXME: consider the search path list for directory, too.
Printf ("W_Init: Init WADfiles.\n");
Wads.InitMultipleFiles (&wadfiles);
Wads.InitMultipleFiles (&wadfiles, loaddir);
// [RH] Initialize localizable strings.
GStrings.LoadStrings (false);