Merge branch 'main' into font-as-resource

Author: briaguya-ai

src/resource/archive/ArchiveManager.cpp

@@ -40,40 +40,31 @@ bool ArchiveManager::IsArchiveLoaded() {
     return !mArchives.empty();
 }
 
-std::shared_ptr<File> ArchiveManager::LoadFile(const std::string& filePath, std::shared_ptr<ResourceInitData> initData) {
+std::shared_ptr<File> ArchiveManager::LoadFile(const std::string& filePath) {
     if (filePath == "") {
         return nullptr;
     }
 
-    const auto archive = mFileToArchive[CRC64(filePath.c_str())];
-    if (archive == nullptr) {
-        return nullptr;
-    }
-
-    return archive->LoadFile(filePath, initData);
+    return LoadFile(CRC64(filePath.c_str()), initData);
 }
 
-std::shared_ptr<File> ArchiveManager::LoadFile(uint64_t hash, std::shared_ptr<ResourceInitData> initData) {
+std::shared_ptr<File> ArchiveManager::LoadFile(uint64_t hash) {
     const auto archive = mFileToArchive[hash];
     if (archive == nullptr) {
         return nullptr;
     }
 
-    return archive->LoadFile(hash, initData);
+    auto file = archive->LoadFile(hash, initData);
+    file->Parent = archive;
+    return file;
 }
 
-//TODO remove
 std::shared_ptr<File> ArchiveManager::LoadFileRaw(const std::string& filePath) {
     if (filePath == "") {
         return nullptr;
     }
 
-    const auto archive = mFileToArchive[CRC64(filePath.c_str())];
-    if (archive == nullptr) {
-        return nullptr;
-    }
-
-    return archive->LoadFileRaw(filePath);
+    return LoadFileRaw(CRC64(filePath.c_str()));
 }
 
 std::shared_ptr<File> ArchiveManager::LoadFileRaw(uint64_t hash) {
@@ -82,9 +73,10 @@ std::shared_ptr<File> ArchiveManager::LoadFileRaw(uint64_t hash) {
         return nullptr;
     }
 
-    return archive->LoadFileRaw(hash);
+    auto file = archive->LoadFileRaw(hash);
+    file->Parent = archive;
+    return file;
 }
-//ENDTODO
 
 bool ArchiveManager::HasFile(const std::string& filePath) {
     return HasFile(CRC64(filePath.c_str()));

src/resource/archive/O2rArchive.cpp

@@ -53,7 +53,6 @@ std::shared_ptr<File> O2rArchive::LoadFileRaw(const std::string& filePath) {
         SPDLOG_TRACE("Error closing file {} in zip archive  {}.", filePath, GetPath());
     }
 
-    fileToLoad->Parent = dynamic_pointer_cast<Archive>(std::make_shared<O2rArchive>(std::move(*this)));
     fileToLoad->IsLoaded = true;
 
     return fileToLoad;

src/resource/archive/OtrArchive.cpp

@@ -50,7 +50,6 @@ std::shared_ptr<File> OtrArchive::LoadFileRaw(const std::string& filePath) {
         SPDLOG_ERROR("({}) Failed to close file {} from mpq archive {}", GetLastError(), filePath, GetPath());
     }
 
-    fileToLoad->Parent = dynamic_pointer_cast<Archive>(std::make_shared<OtrArchive>(std::move(*this)));
     fileToLoad->IsLoaded = true;
 
     return fileToLoad;