From d1a189defc0e02cb8b3cab57f7725fd7a1975c37 Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 2 Apr 2024 23:49:24 +0200 Subject: [PATCH] chore: convert anim names to lower before adding as indirect asset references --- src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp | 7 ++++++- src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp index a29a386b..40b0b892 100644 --- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp +++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp @@ -8,6 +8,7 @@ #include "InfoString/InfoString.h" #include "ObjLoading.h" #include "Pool/GlobalAssetPool.h" +#include "Utils/StringUtils.h" #include #include @@ -132,7 +133,11 @@ namespace if (ConvertString(value, field.iOffset)) { if (!value.empty()) - m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, value)); + { + auto lowerValue = value; + utils::MakeStringLowerCase(lowerValue); + m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, lowerValue)); + } return true; } diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp index b52e375f..4c0b4c4a 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp @@ -8,6 +8,7 @@ #include "Game/T6/T6.h" #include "InfoString/InfoString.h" #include "Utils/ClassUtils.h" +#include "Utils/StringUtils.h" #include #include @@ -262,7 +263,11 @@ namespace T6 if (ConvertString(value, field.iOffset)) { if (!value.empty()) - m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, value)); + { + auto lowerValue = value; + utils::MakeStringLowerCase(lowerValue); + m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, lowerValue)); + } return true; }