From 7d7507d4532aa92ae9a8aad8c415b471d9d0a6b4 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 7 Dec 2019 00:57:45 +0100 Subject: [PATCH] - always add movie and music subdirectories. --- source/blood/src/blood.cpp | 2 +- source/common/filesystem/file_directory.cpp | 6 ++++-- source/common/initfs.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp index b7f692460..4be3d78cf 100644 --- a/source/blood/src/blood.cpp +++ b/source/blood/src/blood.cpp @@ -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 } } } diff --git a/source/common/filesystem/file_directory.cpp b/source/common/filesystem/file_directory.cpp index bbc6d23f5..30686bf77 100644 --- a/source/common/filesystem/file_directory.cpp +++ b/source/common/filesystem/file_directory.cpp @@ -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 << '/'; diff --git a/source/common/initfs.cpp b/source/common/initfs.cpp index cb9bda281..762825867 100644 --- a/source/common/initfs.cpp +++ b/source/common/initfs.cpp @@ -129,7 +129,7 @@ bool D_AddFile (TArray &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);