From 4315423200af3ba414b9057e1755048af6a85a14 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@users.noreply.github.com>
Date: Sat, 4 Apr 2015 17:38:45 -0500
Subject: [PATCH] Rename ns_invalid to ns_hidden

- Also use ns_hidden by name in LumpNameSetup().
---
 src/resourcefiles/resourcefile.cpp | 6 +++---
 src/w_wad.h                        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/resourcefiles/resourcefile.cpp b/src/resourcefiles/resourcefile.cpp
index 6b4c8c29b..bb3776e83 100644
--- a/src/resourcefiles/resourcefile.cpp
+++ b/src/resourcefiles/resourcefile.cpp
@@ -115,12 +115,12 @@ void FResourceLump::LumpNameSetup(FString iname)
 				!strncmp(iname, "sounds/", 7)		? ns_sounds :
 				!strncmp(iname, "music/", 6)		? ns_music : 
 				!strchr(iname, '/')					? ns_global :
-				-1;
+				ns_hidden;
 	
 	// 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 
 	// the ones which look for the full name.
-	if (Namespace == -1)
+	if (Namespace == ns_hidden)
 	{
 		memset(Name, 0, 8);
 	}
@@ -428,7 +428,7 @@ void FResourceFile::JunkLeftoverFilters(void *lumps, size_t lumpsize, DWORD max)
 			FResourceLump *lump = (FResourceLump *)p;
 			lump->FullName = 0;
 			lump->Name[0] = '\0';
-			lump->Namespace = ns_invalid;
+			lump->Namespace = ns_hidden;
 		}
 	}
 }
diff --git a/src/w_wad.h b/src/w_wad.h
index 262a332c6..63912373e 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -52,7 +52,7 @@ struct wadlump_t
 
 // [RH] Namespaces from BOOM.
 typedef enum {
-	ns_invalid = -1,
+	ns_hidden = -1,
 
 	ns_global = 0,
 	ns_sprites,