zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-18 23:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename ns_invalid to ns_hidden

Browse source 
- Also use ns_hidden by name in LumpNameSetup().
This commit is contained in:
Randy Heit 2015-04-04 17:38:45 -05:00
parent 2103fe2a14
commit 4315423200
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/resourcefiles/resourcefile.cpp
View file

@ -115,12 +115,12 @@ void FResourceLump::LumpNameSetup(FString iname)
!strncmp(iname, "sounds/", 7) ? ns_sounds : !strncmp(iname, "sounds/", 7) ? ns_sounds :
!strncmp(iname, "music/", 6) ? ns_music : !strncmp(iname, "music/", 6) ? ns_music :
!strchr(iname, '/') ? ns_global : !strchr(iname, '/') ? ns_global :
-1; ns_hidden;
// Anything that is not in one of these subdirectories or the main directory // Anything that is not in one of these subdirectories or the main directory
// should not be accessible through the standard WAD functions but only through // should not be accessible through the standard WAD functions but only through
// the ones which look for the full name. // the ones which look for the full name.
if (Namespace == -1) if (Namespace == ns_hidden)
{ {
memset(Name, 0, 8); memset(Name, 0, 8);
} }
@ -428,7 +428,7 @@ void FResourceFile::JunkLeftoverFilters(void *lumps, size_t lumpsize, DWORD max)
FResourceLump *lump = (FResourceLump *)p; FResourceLump *lump = (FResourceLump *)p;
lump->FullName = 0; lump->FullName = 0;
lump->Name[0] = '\0'; lump->Name[0] = '\0';
lump->Namespace = ns_invalid; lump->Namespace = ns_hidden;
} }
} }
} }

2
src/w_wad.h
View file

@ -52,7 +52,7 @@ struct wadlump_t
// [RH] Namespaces from BOOM. // [RH] Namespaces from BOOM.
typedef enum { typedef enum {
ns_invalid = -1, ns_hidden = -1,
ns_global = 0, ns_global = 0,
ns_sprites, ns_sprites,