Refactor|DEH Reader: Updated DED, MapInfo access (now Record)

skyjake · Jul 28, 2014 · ef4063c · ef4063c
1 parent 2ced9df
commit ef4063c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/doomsday/plugins/dehread/include/dehreader_util.h b/doomsday/plugins/dehread/include/dehreader_util.h
@@ -27,13 +27,12 @@
 
 #include <QString>
 #include <QStringList>
+#include <doomsday/defs/mapinfo.h>
 #include "dehreader.h"
 
 /// @return Newly composed map URI.
 de::Uri composeMapUri(int episode, int map);
 
-int mapInfoDefForUri(de::Uri const &uri, ded_mapinfo_t **def = 0);
-
 int valueDefForPath(de::String const &id, ded_value_t **def = 0);
 
 /**

diff --git a/doomsday/plugins/dehread/src/dehreader.cpp b/doomsday/plugins/dehread/src/dehreader.cpp
@@ -1449,13 +1449,12 @@ class DehReader
 
                     // Apply.
                     de::Uri const uri = composeMapUri(episode, map);
-                    ded_mapinfo_t *def;
-                    int idx = mapInfoDefForUri(uri, &def);
+                    int idx = ded->getMapInfoNum(&uri);
                     if(idx >= 0)
                     {
-                        def->parTime = parTime;
+                        ded->mapInfos[idx].set("parTime", parTime);
                         LOG_DEBUG("MapInfo #%i \"%s\" parTime => %d")
-                                << idx << uri << def->parTime;
+                                << idx << uri << parTime;
                     }
                     else
                     {

diff --git a/doomsday/plugins/dehread/src/dehreader_util.cpp b/doomsday/plugins/dehread/src/dehreader_util.cpp
@@ -35,21 +35,6 @@ de::Uri composeMapUri(int episode, int map)
     }
 }
 
-int mapInfoDefForUri(de::Uri const &uri, ded_mapinfo_t **def)
-{
-    if(!uri.path().isEmpty())
-    for(int i = ded->mapInfo.size() - 1; i >= 0; i--)
-    {
-        ded_mapinfo_t &info = ded->mapInfo[i];
-        if(info.uri && *info.uri == uri)
-        {
-            if(def) *def = &info;
-            return i;
-        }
-    }
-    return -1; // Not found.
-}
-
 int valueDefForPath(String const &id, ded_value_t **def)
 {
     if(!id.isEmpty())