WadMapConverter: Removed the now unused maplumpinfo.h

skyjake · Dec 20, 2013 · 6aff847 · 6aff847
1 parent 18c1459
commit 6aff847
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 69 deletions.
diff --git a/doomsday/plugins/wadmapconverter/include/id1map.h b/doomsday/plugins/wadmapconverter/include/id1map.h
@@ -20,7 +20,7 @@
 #ifndef WADMAPCONVERTER_ID1MAP_H
 #define WADMAPCONVERTER_ID1MAP_H
 
-#include "maplumpinfo.h"
+#include "id1map_util.h"
 #include <de/Error>
 #include <de/String>
 #include <de/StringPool>
@@ -47,9 +47,11 @@ class Id1Map
     /// Logical map format identifiers.
     enum Format {
         UnknownFormat = -1,
+
         DoomFormat,
         HexenFormat,
         Doom64Format,
+
         MapFormatCount
     };
 

diff --git a/doomsday/plugins/wadmapconverter/include/id1map_util.h b/doomsday/plugins/wadmapconverter/include/id1map_util.h
@@ -22,9 +22,43 @@
 #ifndef WADMAPCONVERTER_ID1MAP_UTIL
 #define WADMAPCONVERTER_ID1MAP_UTIL
 
-#include "id1map.h"
 #include <de/String>
 
+/**
+ * Logical map data lump identifier (unique).
+ */
+enum MapLumpType {
+    ML_INVALID          = -1,
+    FIRST_MAPLUMP_TYPE  = 0,
+    ML_THINGS = FIRST_MAPLUMP_TYPE, ///< Monsters, items..
+    ML_LINEDEFS,                ///< Line definitions.
+    ML_SIDEDEFS,                ///< Side definitions.
+    ML_VERTEXES,                ///< Vertices.
+    ML_SEGS,                    ///< BSP subsector segments.
+    ML_SSECTORS,                ///< BSP subsectors (open).
+    ML_NODES,                   ///< BSP nodes.
+    ML_SECTORS,                 ///< Sectors.
+    ML_REJECT,                  ///< LUT, sector-sector visibility
+    ML_BLOCKMAP,                ///< LUT, motion clipping, walls/grid element.
+    ML_BEHAVIOR,                ///< ACS Scripts (compiled).
+    ML_SCRIPTS,                 ///< ACS Scripts (source).
+    ML_LIGHTS,                  ///< Surface color tints.
+    ML_MACROS,                  ///< DOOM64 format, macro scripts.
+    ML_LEAFS,                   ///< DOOM64 format, segs (closed subsectors).
+    ML_GLVERT,                  ///< GL vertexes.
+    ML_GLSEGS,                  ///< GL segs.
+    ML_GLSSECT,                 ///< GL subsectors.
+    ML_GLNODES,                 ///< GL nodes.
+    ML_GLPVS,                   ///< GL PVS dataset.
+    NUM_MAPLUMP_TYPES
+};
+
+/**
+ * Helper macro for determining whether a value can be interpreted as a logical
+ * map lump type identifier (see MapLumpType).
+ */
+#define VALID_MAPLUMPTYPE(v)    ((v) >= FIRST_MAPLUMP_TYPE && (v) < NUM_MAPLUMP_TYPES)
+
 /**
  * Determine type of a named map data lump.
  * @param name  Name of the data lump.

diff --git a/doomsday/plugins/wadmapconverter/include/maplumpinfo.h b/doomsday/plugins/wadmapconverter/include/maplumpinfo.h
diff --git a/doomsday/plugins/wadmapconverter/src/id1map_loadblockmap.cpp b/doomsday/plugins/wadmapconverter/src/id1map_loadblockmap.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "wadmapconverter.h"
-#include "maplumpinfo.h"
 #include <de/Log>
 
 using namespace de;

diff --git a/doomsday/plugins/wadmapconverter/src/id1map_util.cpp b/doomsday/plugins/wadmapconverter/src/id1map_util.cpp
@@ -20,8 +20,7 @@
  * 02110-1301 USA</small>
  */
 
-#include "wadmapconverter.h"
-#include "maplumpinfo.h"
+#include "id1map_util.h"
 #include <de/libdeng2.h>
 
 using namespace de;

diff --git a/doomsday/plugins/wadmapconverter/wadmapconverter.pro b/doomsday/plugins/wadmapconverter/wadmapconverter.pro
@@ -20,7 +20,6 @@ HEADERS += \
     include/id1map_datatypes.h \
     include/id1map_load.h \
     include/id1map_util.h \
-    include/maplumpinfo.h \
     include/version.h \
     include/wadmapconverter.h