zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-01 06:10:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

- clean up includes in 3 files.

Browse source
This commit is contained in:
Christoph Oelckers 2023-08-19 15:46:10 +02:00
parent 9f45cc0469
commit 7f024debfd
3 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/common/filesystem/file_whres.cpp
View file

@ -39,18 +39,9 @@
using namespace fs_private;
#include "fs_swap.h"
using namespace fs_private;
//==========================================================================
//
//
//
//==========================================================================
//==========================================================================
//
// Wad file
// WH resource file
//
//==========================================================================
@ -65,9 +56,7 @@ public:
//==========================================================================
//
// FWadFile::FWadFile
//
// Initializes a WAD file
//
//==========================================================================

2
src/common/filesystem/files.cpp
View file

@ -38,8 +38,6 @@
using namespace fs_private;
using namespace fs_private;
#ifdef _WIN32
std::wstring toWide(const char* str);
#endif

8
src/common/filesystem/resourcefile.cpp
View file

@ -36,9 +36,8 @@
#include <zlib.h>
#include "resourcefile.h"
#include "cmdlib.h"
#include "md5.h"
#include "md5.h"
std::string ExtractBaseName(const char* path, bool include_extension)
{
@ -290,9 +289,10 @@ static int nulPrintf(FSMessageLevel msg, const char* fmt, ...)
FResourceFile *FResourceFile::DoOpenResourceFile(const char *filename, FileReader &file, bool containeronly, LumpFilterInfo* filter, FileSystemMessageFunc Printf)
{
if (Printf == nullptr) Printf = nulPrintf;
for(size_t i = 0; i < countof(funcs) - containeronly; i++)
for(auto func : funcs)
{
FResourceFile *resfile = funcs[i](filename, file, filter, Printf);
if (containeronly && func == CheckLump) break;
FResourceFile *resfile = func(filename, file, filter, Printf);
if (resfile != NULL) return resfile;
}
return NULL;