From a925bd505d03e7555bc0bdf01148ae211e18ad17 Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 25 Oct 2020 11:41:26 +0100 Subject: [PATCH] Fix assets being added to their pools twice when loaded from a fastfile --- src/ZoneCommon/Game/IW4/GameAssetPoolIW4.cpp | 7 +------ src/ZoneCommon/Game/T6/GameAssetPoolT6.cpp | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/ZoneCommon/Game/IW4/GameAssetPoolIW4.cpp b/src/ZoneCommon/Game/IW4/GameAssetPoolIW4.cpp index 176a609c..9cae165a 100644 --- a/src/ZoneCommon/Game/IW4/GameAssetPoolIW4.cpp +++ b/src/ZoneCommon/Game/IW4/GameAssetPoolIW4.cpp @@ -269,12 +269,7 @@ XAssetInfoGeneric* GameAssetPoolIW4::AddAssetToPool(asset_type_t type, std::stri case assetType: \ { \ assert((poolName) != nullptr); \ - auto* assetInfo = (poolName)->AddAsset(std::move(name), xAsset.header.headerName, m_zone, dependencies); \ - if(assetInfo) \ - { \ - m_assets_in_order.push_back(assetInfo); \ - } \ - return assetInfo; \ + return (poolName)->AddAsset(std::move(name), xAsset.header.headerName, m_zone, dependencies); \ } switch (xAsset.type) diff --git a/src/ZoneCommon/Game/T6/GameAssetPoolT6.cpp b/src/ZoneCommon/Game/T6/GameAssetPoolT6.cpp index 9c7a7209..52cb529e 100644 --- a/src/ZoneCommon/Game/T6/GameAssetPoolT6.cpp +++ b/src/ZoneCommon/Game/T6/GameAssetPoolT6.cpp @@ -338,12 +338,7 @@ XAssetInfoGeneric* GameAssetPoolT6::AddAssetToPool(asset_type_t type, std::strin case assetType: \ { \ assert((poolName) != nullptr); \ - auto* assetInfo = (poolName)->AddAsset(std::move(name), xAsset.header.headerName, m_zone, dependencies); \ - if(assetInfo) \ - { \ - m_assets_in_order.push_back(assetInfo); \ - } \ - return assetInfo; \ + return (poolName)->AddAsset(std::move(name), xAsset.header.headerName, m_zone, dependencies); \ } switch (xAsset.type)