add mount point to pak paths

Author: moritz-h

libsave/src/Pak/PakFile.cpp

@@ -78,6 +78,11 @@ SatisfactorySave::PakFile::PakFile(const std::filesystem::path& pakPath) : NumEn
         throw std::runtime_error("FullDirectoryIndex missing in pak file!");
     }
 
+    if (!MountPoint.starts_with("../../../")) {
+        throw std::runtime_error("Invalid mount point");
+    }
+    const auto abs_mount_point = MountPoint.substr(9);
+
     // Parse full directory index. Structure is TMap<FString, TMap<FString, int32>>.
     ar.seek(FullDirectoryIndexOffset);
     const int32_t FullDirectoryIndexNum = ar.read<int32_t>();
@@ -89,7 +94,7 @@ SatisfactorySave::PakFile::PakFile(const std::filesystem::path& pakPath) : NumEn
             std::string fileName;
             ar << fileName;
             const int32_t fileEntryIdx = ar.read<int32_t>();
-            const std::string fullFileName = directoryName + fileName;
+            const std::string fullFileName = abs_mount_point + directoryName + fileName;
             if (directoryEntries_.contains(fullFileName)) {
                 throw std::runtime_error("Directory filename entry is not unique!");
             }

libsave/src/Pak/PakManager.cpp

@@ -96,14 +96,14 @@ void SatisfactorySave::PakManager::cacheLatestPakNames(const std::optional<std::
                 path = "Game/" + filename.substr(20);
             }
         } else {
-            if (filename.starts_with("Content/")) {
-                path = filename.substr(8);
+            if (!path.starts_with("FactoryGame/Mods/")) {
+                throw std::runtime_error("Mod asset outside \"FactoryGame/Mods/\"!");
             }
-            bool startsWithSlash = !path.empty() && path[0] == '/';
-            if (startsWithSlash) {
-                path = modPrefix.value() + path;
-            } else {
-                path = modPrefix.value() + "/" + path;
+            path = path.substr(17);
+
+            const auto content_name = modPrefix.value() + "/Content/";
+            if (path.starts_with(content_name)) {
+                path = modPrefix.value() + "/" + path.substr(content_name.size());
             }
         }