Backport mAltAssetsEnabled functionality from 2.0. (Kenix3#644)

Spodi · Jul 17, 2024 · 275c741 · 275c741
1 parent ce9dd90
commit 275c741
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/resource/ResourceManager.cpp b/src/resource/ResourceManager.cpp
@@ -77,7 +77,7 @@ std::shared_ptr<IResource> ResourceManager::LoadResourceProcess(const std::strin
 
     // Attempt to load the alternate version of the asset, if we fail then we continue trying to load the standard
     // asset.
-    if (!loadExact && CVarGetInteger("gAltAssets", 0) && !filePath.starts_with(IResource::gAltAssetPrefix)) {
+    if (!loadExact && mAltAssetsEnabled && !filePath.starts_with(IResource::gAltAssetPrefix)) {
         const auto altPath = IResource::gAltAssetPrefix + filePath;
         auto altResource = LoadResourceProcess(altPath, loadExact);
 
@@ -96,7 +96,7 @@ std::shared_ptr<IResource> ResourceManager::LoadResourceProcess(const std::strin
 
     // Check for resource load errors which can indicate an alternate asset.
     // If we are attempting to load an alternate asset, we can return null
-    if (!loadExact && CVarGetInteger("gAltAssets", 0) && filePath.starts_with(IResource::gAltAssetPrefix)) {
+    if (!loadExact && mAltAssetsEnabled && filePath.starts_with(IResource::gAltAssetPrefix)) {
         if (std::holds_alternative<ResourceLoadError>(cacheLine)) {
             try {
                 // If we have attempted to cache an alternate asset, but failed, we return nullptr and rely on the
@@ -196,7 +196,7 @@ std::shared_ptr<IResource> ResourceManager::LoadResource(const std::string& file
 
 std::variant<ResourceManager::ResourceLoadError, std::shared_ptr<IResource>>
 ResourceManager::CheckCache(const std::string& filePath, bool loadExact) {
-    if (!loadExact && CVarGetInteger("gAltAssets", 0) && !filePath.starts_with(IResource::gAltAssetPrefix)) {
+    if (!loadExact && mAltAssetsEnabled && !filePath.starts_with(IResource::gAltAssetPrefix)) {
         const auto altPath = IResource::gAltAssetPrefix + filePath;
         auto altCacheResult = CheckCache(altPath, loadExact);
 
@@ -337,4 +337,12 @@ bool ResourceManager::OtrSignatureCheck(const char* fileName) {
     return strncmp(fileName, sOtrSignature, strlen(sOtrSignature)) == 0;
 }
 
+bool ResourceManager::IsAltAssetsEnabled() {
+    return mAltAssetsEnabled;
+}
+
+void ResourceManager::SetAltAssetsEnabled(bool isEnabled) {
+    mAltAssetsEnabled = isEnabled;
+}
+
 } // namespace LUS
diff --git a/src/resource/ResourceManager.h b/src/resource/ResourceManager.h
@@ -44,6 +44,8 @@ class ResourceManager {
     void DirtyDirectory(const std::string& searchMask);
     void UnloadDirectory(const std::string& searchMask);
     bool OtrSignatureCheck(const char* fileName);
+    bool IsAltAssetsEnabled();
+    void SetAltAssetsEnabled(bool isEnabled);
 
   protected:
     std::shared_ptr<File> LoadFileProcess(const std::string& filePath);
@@ -57,5 +59,6 @@ class ResourceManager {
     std::shared_ptr<Archive> mArchive;
     std::shared_ptr<BS::thread_pool> mThreadPool;
     std::mutex mMutex;
+    bool mAltAssetsEnabled = false;
 };
 } // namespace LUS