Hexen|MapInfoParser: Cleanup

skyjake · Jan 25, 2014 · 2d44bf7 · 2d44bf7
1 parent b3ed8cd
commit 2d44bf7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/doomsday/plugins/hexen/include/p_mapinfo.h b/doomsday/plugins/hexen/include/p_mapinfo.h
@@ -29,8 +29,6 @@
 #include "doomsday.h"
 
 typedef struct mapinfo_s {
-    dd_bool      usingDefaults; ///< @c true= this definition was @em not read from MAPINFO.
-
     uint         map; ///< Logical map number.
     short        cluster;
     uint         warpTrans;

diff --git a/doomsday/plugins/hexen/src/p_mapinfo.cpp b/doomsday/plugins/hexen/src/p_mapinfo.cpp
@@ -54,9 +54,8 @@ void MapInfoParser(Str const *path)
     mapInfos.clear();
     uint logicalMapIndex = 0;
 
-    // Configure the defaults
+    // Prepare a default-configured definition, for one-shot initialization.
     mapinfo_t defMapInfo;
-    defMapInfo.usingDefaults   = true;
 
     defMapInfo.map             = -1; // Unknown.
     defMapInfo.cluster         = 0;
@@ -132,9 +131,6 @@ void MapInfoParser(Str const *path)
                     // Initialize with the default values.
                     std::memcpy(info, &defMapInfo, sizeof(*info));
 
-                    // This information has been parsed from MAPINFO.
-                    info->usingDefaults = false;
-
                     // Assign a logical map index.
                     info->map = logicalMapIndex++;
 
@@ -270,8 +266,6 @@ uint P_TranslateMapIfExists(uint map)
     {
         mapinfo_t const &info = i->second;
 
-        if(info.usingDefaults) continue; // Ignoring, undefined values.
-
         if(info.warpTrans == map)
         {
             if(info.cluster)