zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- always add movie and music subdirectories.

This commit is contained in:
Christoph Oelckers 2019-12-07 00:57:45 +01:00
parent 5c7b05a791
commit 7d7507d453
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blood/src/blood.cpp
View File

@ -375,7 +375,7 @@ static void PrecacheSounds(void)
if (pNode->ResType() == NAME_RAW || pNode->ResType() == NAME_SFX)
{
pNode->Get();
if ((i&15) == 15) gameHandleEvents(); // don't do this too often. That made sense in 1996 but not in 2019
//if ((i&15) == 15) gameHandleEvents(); // don't do this too often. That made sense in 1996 but not in 2019
}
}
}

6
source/common/filesystem/file_directory.cpp
View File

@ -149,8 +149,10 @@ int FDirectory::AddDirectory(const char *dirpath)
(fi[1] == '\0' ||
(fi[1] == '.' && fi[2] == '\0'))))
{
// Skip if requested and do not record . and .. directories.
continue;
// Movie and music subdirectories must always pass.
if (fi.CompareNoCase("movie") && fi.CompareNoCase("music"))
// Skip if requested and do not record . and .. directories.
continue;
}
FString newdir = dirpath;
newdir << fi << '/';

2
source/common/initfs.cpp
View File

@ -129,7 +129,7 @@ bool D_AddFile (TArray<FString> &wadfiles, const char *file, bool check = true,
if (check && !DirEntryExists (file))
{
const char *f = BaseFileSearch (file, ".wad", false);
const char *f = BaseFileSearch (file, ".grp", false);
if (f == NULL)
{
Printf ("Can't find '%s'\n", file);