Keep original paths for areas, worlds, and maps when not in a world pak

DataSpec/DNACommon/MAPA.cpp

@@ -92,8 +92,14 @@ bool ReadMAPAToBlender(hecl::BlenderConnection& conn,
                        const typename PAKRouter::EntryType& entry,
                        bool force)
 {
+    hecl::ProjectPath mapaPath;
+    if (pakRouter.isShared())
         /* Rename MAPA for consistency */
-    hecl::ProjectPath mapaPath(outPath.getParentPath(), _S("!map.blend"));
+        mapaPath = hecl::ProjectPath(outPath.getParentPath(), _S("!map.blend"));
+    else
+        /* We're not in a world pak, so lets keep the original name */
+        mapaPath = outPath;
+
     if (!force && mapaPath.getPathType() == hecl::ProjectPath::Type::File)
         return true;
 

DataSpec/DNACommon/MLVL.cpp

@@ -17,8 +17,13 @@ bool ReadMLVLToBlender(hecl::BlenderConnection& conn,
                        bool force,
                        std::function<void(const hecl::SystemChar*)> fileChanged)
 {
+    hecl::ProjectPath mlvlPath;
+    if (pakRouter.isShared())
         /* Rename MLVL for consistency */
-    hecl::ProjectPath mlvlPath(outPath.getParentPath(), _S("!world.blend"));
+        mlvlPath = hecl::ProjectPath(outPath.getParentPath(), _S("!world.blend"));
+    else
+        /* We're not in a world pak, so lets keep the original name */
+        mlvlPath = outPath;
     if (!force && mlvlPath.getPathType() == hecl::ProjectPath::Type::File)
         return true;
 

DataSpec/DNACommon/PAK.hpp

@@ -147,6 +147,7 @@ public:
     hecl::ProjectPath getWorking(const IDType& id) const;
     hecl::ProjectPath getCooked(const EntryType* entry) const;
     hecl::ProjectPath getCooked(const IDType& id) const;
+    bool isShared() { return m_pak ? !m_pak->m_noShare : false;  }
 
     hecl::SystemString getResourceRelativePath(const EntryType& a, const IDType& b) const;
 

DataSpec/DNAMP1/MREA.cpp

@@ -62,8 +62,14 @@ bool MREA::Extract(const SpecBase& dataSpec,
     using RigPair = std::pair<CSKR*, CINF*>;
     RigPair dummy(nullptr, nullptr);
 
+    hecl::ProjectPath mreaPath;
+    if (pakRouter.isShared())
         /* Rename MREA for consistency */
-    hecl::ProjectPath mreaPath(outPath.getParentPath(), _S("!area.blend"));
+        mreaPath = hecl::ProjectPath(outPath.getParentPath(), _S("!area.blend"));
+    else
+        /* We're not in a world pak, so lets keep the original name */
+        mreaPath = outPath;
+
     if (!force && mreaPath.getPathType() == hecl::ProjectPath::Type::File)
         return true;
 

DataSpec/DNAMP2/MREA.cpp

@@ -168,8 +168,14 @@ bool MREA::Extract(const SpecBase& dataSpec,
     using RigPair = std::pair<CSKR*, CINF*>;
     RigPair dummy(nullptr, nullptr);
 
+    hecl::ProjectPath mreaPath;
+    if (pakRouter.isShared())
         /* Rename MREA for consistency */
-    hecl::ProjectPath mreaPath(outPath.getParentPath(), _S("!area.blend"));
+        mreaPath = hecl::ProjectPath(outPath.getParentPath(), _S("!area.blend"));
+    else
+        /* We're not in a world pak, so lets keep the original name */
+        mreaPath = outPath;
+
     if (!force && mreaPath.getPathType() == hecl::ProjectPath::Type::File)
         return true;
 

DataSpec/DNAMP3/MREA.cpp

@@ -77,8 +77,14 @@ bool MREA::Extract(const SpecBase& dataSpec,
     using RigPair = std::pair<CSKR*, CINF*>;
     RigPair dummy(nullptr, nullptr);
 
+    hecl::ProjectPath mreaPath;
+    if (pakRouter.isShared())
         /* Rename MREA for consistency */
-    hecl::ProjectPath mreaPath(outPath.getParentPath(), _S("!area.blend"));
+        mreaPath = hecl::ProjectPath(outPath.getParentPath(), _S("!area.blend"));
+    else
+        /* We're not in a world pak, so lets keep the original name */
+        mreaPath = outPath;
+
     if (!force && mreaPath.getPathType() == hecl::ProjectPath::Type::File)
         return true;