OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

take namespace enum out of namespace and added CheckNumForAnyName and CheckNumForFullNameInFile to clarify the meaning of CheckNumForFullName.

Browse source 
This is to take some renaming noise out of the upcoming refactoring.
This commit is contained in:
Christoph Oelckers 2024-11-24 13:18:46 +01:00
commit 634a646c2d
51 changed files with 118 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/common/filesystem/include/fs_filesystem.h
View file

@ -66,8 +66,13 @@ public:
inline int GetNumForName (const uint8_t *name, int ns) const { return GetNumForName ((const char *)name, ns); }
int CheckNumForFullName (const char *cname, bool trynormal = false, int namespc = ns_global, bool ignoreext = false) const;
int CheckNumForFullName (const char *name, int wadfile) const;
int CheckNumForFullNameInFile (const char *name, int wadfile) const;
int GetNumForFullName (const char *name) const;
int CheckNumForAnyName(const char* cname, namespace_t namespc = ns_global) const
{
return CheckNumForFullName(cname, true, namespc);
}
int FindFile(const char* name) const
{
return CheckNumForFullName(name);

4
src/common/filesystem/include/resourcefile.h
View file

@ -45,6 +45,8 @@ using FileSystemMessageFunc = int(*)(FSMessageLevel msglevel, const char* format
class FResourceFile;
}
// [RH] Namespaces from BOOM.
// These are needed here in the low level part so that WAD files can be properly set up.
typedef enum {
@ -76,6 +78,8 @@ typedef enum {
ns_firstskin,
} namespace_t;
namespace FileSys {
enum ELumpFlags
{
RESFF_MAYBEFLAT = 1, // might be a flat inside a WAD outside F_START/END