make sure to set it in non-raw loadfile too

briaguya-ai · briaguya-ai · commit 08c931893639 · 2024-02-20T21:52:08.000-05:00
diff --git a/src/resource/archive/ArchiveManager.cpp b/src/resource/archive/ArchiveManager.cpp
@@ -45,12 +45,7 @@ std::shared_ptr<File> ArchiveManager::LoadFile(const std::string& filePath) {
         return nullptr;
     }
 
-    const auto archive = mFileToArchive[CRC64(filePath.c_str())];
-    if (archive == nullptr) {
-        return nullptr;
-    }
-
-    return archive->LoadFile(filePath);
+    return LoadFile(CRC64(filePath.c_str()));
 }
 
 std::shared_ptr<File> ArchiveManager::LoadFile(uint64_t hash) {
@@ -59,7 +54,9 @@ std::shared_ptr<File> ArchiveManager::LoadFile(uint64_t hash) {
         return nullptr;
     }
 
-    return archive->LoadFile(hash);
+    auto file = archive->LoadFile(hash);
+    file->Parent = archive;
+    return file;
 }
 
 std::shared_ptr<File> ArchiveManager::LoadFileRaw(const std::string& filePath) {

Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,7 @@ std::shared_ptr<File> ArchiveManager::LoadFile(const std::string& filePath) {`
`45`	`45`	`return nullptr;`
`46`	`46`	`}`
`47`	`47`
`48`		`- const auto archive = mFileToArchive[CRC64(filePath.c_str())];`
`49`		`- if (archive == nullptr) {`
`50`		`- return nullptr;`
`51`		`- }`
`52`		`-`
`53`		`- return archive->LoadFile(filePath);`
	`48`	`+ return LoadFile(CRC64(filePath.c_str()));`
`54`	`49`	`}`
`55`	`50`
`56`	`51`	`std::shared_ptr<File> ArchiveManager::LoadFile(uint64_t hash) {`
`@@ -59,7 +54,9 @@ std::shared_ptr<File> ArchiveManager::LoadFile(uint64_t hash) {`
`59`	`54`	`return nullptr;`
`60`	`55`	`}`
`61`	`56`
`62`		`- return archive->LoadFile(hash);`
	`57`	`+ auto file = archive->LoadFile(hash);`
	`58`	`+ file->Parent = archive;`
	`59`	`+ return file;`
`63`	`60`	`}`
`64`	`61`
`65`	`62`	`std::shared_ptr<File> ArchiveManager::LoadFileRaw(const std::string& filePath) {`