zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Extended check for embedded WADs with one special case

Browse source 
Added loading of embedded WAD file if `myfile.wad` is placed in `myfile` directory inside `myfile.zip`
This helps with an unpleasant and very annoying fashion to zip a folder instead of just .wad and .txt files.
Recent examples include
Monster Hunter Ltd.: http://www.doomworld.com/idgames/?id=17601 and http://www.doomworld.com/idgames/?id=17625
Hell Awakened 2 Episode 1: http://www.doomworld.com/idgames/?id=17795
Bauhaus: http://www.doomworld.com/idgames/?id=17954
This commit is contained in:
alexey.lysiuk 2015-01-11 11:43:43 +02:00
parent 5336f1085c
commit 7ae3678abc
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/resourcefiles/resourcefile.cpp
View file

@ -150,11 +150,22 @@ void FResourceLump::LumpNameSetup(const char *iname)
// //
//========================================================================== //==========================================================================
static bool IsWadInFolder(const char* const fullName)
{
// Checks a special case when <myfile.wad> was put in
// <myfile> directory inside <myfile.zip>
const FString baseName = ExtractFileBase(fullName);
const FString fileName = baseName + '/' + baseName + ".wad";
return 0 == fileName.CompareNoCase(fullName);
}
void FResourceLump::CheckEmbedded() void FResourceLump::CheckEmbedded()
{ {
// Checks for embedded archives // Checks for embedded archives
const char *c = strstr(FullName, ".wad"); const char *c = strstr(FullName, ".wad");
if (c && strlen(c) == 4 && !strchr(FullName, '/')) if (c && strlen(c) == 4 && (!strchr(FullName, '/') || IsWadInFolder(FullName)))
{ {
// Mark all embedded WADs // Mark all embedded WADs
Flags |= LUMPF_EMBEDDED; Flags |= LUMPF_EMBEDDED;