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

12
src/w_wad.cpp
View file

@ -160,7 +160,7 @@ void FWadCollection::DeleteAll ()
//
//==========================================================================
void FWadCollection::InitMultipleFiles (wadlist_t **filenames)
void FWadCollection::InitMultipleFiles (wadlist_t **filenames, const char *loaddir)
{
int numfiles;
@ -183,6 +183,7 @@ void FWadCollection::InitMultipleFiles (wadlist_t **filenames)
M_Free (*filenames);
*filenames = next;
}
AddFile(loaddir, NULL, true);
NumLumps = LumpInfo.Size();
if (NumLumps == 0)
@ -229,11 +230,11 @@ int FWadCollection::AddExternalFile(const char *filename)
// [RH] Removed reload hack
//==========================================================================
void FWadCollection::AddFile (const char *filename, FileReader *wadinfo)
void FWadCollection::AddFile (const char *filename, FileReader *wadinfo, bool isdir)
{
int startlump;
if (wadinfo == NULL)
if (wadinfo == NULL && !isdir)
{
try
{
@ -250,7 +251,10 @@ void FWadCollection::AddFile (const char *filename, FileReader *wadinfo)
Printf (" adding %s", filename);
startlump = NumLumps;
FResourceFile *resfile = FResourceFile::OpenResourceFile(filename, wadinfo);
FResourceFile *resfile;
if (!isdir) resfile = FResourceFile::OpenResourceFile(filename, wadinfo);
else resfile = FResourceFile::OpenDirectory(filename);
if (resfile != NULL)
{