From aa59768416526fc68d591ecca1d29dd7f368a7a3 Mon Sep 17 00:00:00 2001 From: Jan Date: Mon, 22 Apr 2024 19:28:41 +0200 Subject: [PATCH] chore: remove previous manual lower case conversions of indirect asset references --- src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp | 7 ++----- src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp | 7 ++----- src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp | 7 ++----- .../T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.cpp | 1 + 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp index 87659970..fb7e6fb7 100644 --- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp +++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp @@ -137,11 +137,8 @@ namespace if (ConvertString(value, field.iOffset)) { if (!value.empty()) - { - auto lowerValue = value; - utils::MakeStringLowerCase(lowerValue); - m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, lowerValue)); - } + m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, value)); + return true; } diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp index f14bb2c0..acc62b29 100644 --- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp +++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp @@ -135,11 +135,8 @@ namespace if (ConvertString(value, field.iOffset)) { if (!value.empty()) - { - auto lowerValue = value; - utils::MakeStringLowerCase(lowerValue); - m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, lowerValue)); - } + m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, value)); + return true; } diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp index 9df4a899..5bf8b306 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp @@ -263,11 +263,8 @@ namespace T6 if (ConvertString(value, field.iOffset)) { if (!value.empty()) - { - auto lowerValue = value; - utils::MakeStringLowerCase(lowerValue); - m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, lowerValue)); - } + m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, value)); + return true; } diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.cpp index 9c5addfd..4081af74 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.cpp @@ -86,6 +86,7 @@ namespace T6 { if (!value.empty()) m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, value)); + return true; }