zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-23 04:22:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- ignore executable files in a zip's main folder when checking for mod content in a subdirectory.

Browse source
This commit is contained in:
Christoph Oelckers 2023-01-06 18:01:34 +01:00
parent 7cf13ed158
commit cfef8c8a71
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/common/filesystem/file_zip.cpp
View file

@ -266,6 +266,8 @@ bool FZipFile::Open(bool quiet, LumpFilterInfo* filter)
continue; // 'filter' is a reserved name of the file system.
if (name.IndexOf("__macosx") == 0)
continue; // skip Apple garbage. At this stage only the root folder matters.
if (name.IndexOf(".bat") >= 0 || name.IndexOf(".exe") >= 0)
continue; // also ignore executables for this.
if (!foundprefix)
{
// check for special names, if one of these gets found this must be treated as a normal zip.

8
source/core/initfs.cpp
View file

@ -280,10 +280,10 @@ static void DeleteStuff(FileSystem &fileSystem, const TArray<FString>& deletelum
//
//==========================================================================
const char* iwad_folders[13] = { "textures/", "hires/", "sounds/", "music/", "maps/" };
const char* iwad_reserved_duke[12] = { ".map", ".con", "menudef", "gldefs", "zscript", "maps/", nullptr };
const char* iwad_reserved_blood[12] = { ".map", ".ini", "menudef", "gldefs", "zscript", "maps/", nullptr };
const char* iwad_reserved_sw[12] = { ".map", "swcustom.txt", "menudef", "gldefs", "zscript", "maps/", nullptr };
const char* iwad_reserved_ex[12] = { ".map", "menudef", "gldefs", "zscript", "maps/", nullptr };
const char* iwad_reserved_duke[12] = { ".map", "rmapinfo", ".con", "menudef", "gldefs", "zscript", "maps/", nullptr };
const char* iwad_reserved_blood[12] = { ".map", "rmapinfo", ".ini", "menudef", "gldefs", "zscript", "maps/", nullptr };
const char* iwad_reserved_sw[12] = { ".map", "rmapinfo", "swcustom.txt", "menudef", "gldefs", "zscript", "maps/", nullptr };
const char* iwad_reserved_ex[12] = { ".map", "rmapinfo", "menudef", "gldefs", "zscript", "maps/", nullptr };
const char** iwad_reserved()
{

8
wadsrc/static/engine/grpinfo.txt
View file

@ -463,7 +463,7 @@ grpinfo
scriptname "BLOOD.INI"
flags GAMEFLAG_BLOOD
dependency 0
loadgrp "SOUNDS.RFF", "GUI.RFF"
loadgrp "SOUNDS.RFF", "GUI.RFF", "BLOOD.GRP"
gamefilter "Blood.Blood"
FgColor 0
BkColor 0x7f003f
@ -479,7 +479,7 @@ grpinfo
scriptname "BLOOD.INI"
flags GAMEFLAG_BLOOD
dependency 0
loadgrp "SOUNDS.RFF", "GUI.RFF"
loadgrp "SOUNDS.RFF", "GUI.RFF", "BLOOD.GRP"
gamefilter "Blood.Blood"
FgColor 0
BkColor 0xaf0024
@ -495,7 +495,7 @@ grpinfo
scriptname "BLOOD.INI"
flags GAMEFLAG_BLOOD
dependency 0
loadgrp "SOUNDS.RFF", "GUI.RFF"
loadgrp "SOUNDS.RFF", "GUI.RFF", "BLOOD.GRP"
gamefilter "Blood.Blood"
FgColor 0
BkColor 0xaf0024
@ -511,7 +511,7 @@ grpinfo
scriptname "BLOOD.INI"
flags GAMEFLAG_BLOOD
dependency 0
loadgrp "SOUNDS.RFF", "GUI.RFF"
loadgrp "SOUNDS.RFF", "GUI.RFF", "BLOOD.GRP"
gamefilter "Blood.Blood"
}