zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: Dp mot strip the top level folder name in Zips if they only contain one entry or if the first entry isn't a directory.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-27 01:53:51 +01:00
parent c8445703ac
commit 1e1194a669
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/resourcefiles/file_zip.cpp
View file

@ -220,7 +220,7 @@ bool FZipFile::Open(bool quiet)
// Check if all files have the same prefix so that this can be stripped out. // Check if all files have the same prefix so that this can be stripped out.
FString name0; FString name0;
for (DWORD i = 0; i < NumLumps; i++) if (NumLumps > 1) for (DWORD i = 0; i < NumLumps; i++)
{ {
FZipCentralDirectoryInfo *zip_fh = (FZipCentralDirectoryInfo *)dirptr; FZipCentralDirectoryInfo *zip_fh = (FZipCentralDirectoryInfo *)dirptr;
@ -244,6 +244,7 @@ bool FZipFile::Open(bool quiet)
{ {
// check for special names, if one of these gets found this must be treated as a normal zip. // check for special names, if one of these gets found this must be treated as a normal zip.
bool isspecial = !name.Compare("flats/") || bool isspecial = !name.Compare("flats/") ||
name.IndexOf("/") < 0 ||
!name.Compare("textures/") || !name.Compare("textures/") ||
!name.Compare("hires/") || !name.Compare("hires/") ||
!name.Compare("sprites/") || !name.Compare("sprites/") ||