OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch '4.13' of ../gzdoom into gz4.13.1-merge

Browse source
This commit is contained in:
Rachael Alexanderson 2024-10-20 10:23:29 -04:00
commit 7980d351b7
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
32 changed files with 174 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/common/filesystem/source/resourcefile.cpp
View file

@ -163,6 +163,7 @@ static int nulPrintf(FSMessageLevel msg, const char* fmt, ...)
FResourceFile *FResourceFile::DoOpenResourceFile(const char *filename, FileReader &file, bool containeronly, LumpFilterInfo* filter, FileSystemMessageFunc Printf, StringPool* sp)
{
if (!file.isOpen()) return nullptr;
if (Printf == nullptr) Printf = nulPrintf;
for(auto func : funcs)
{