From 6e689766df0834379a6e4220cfb0cc2a9a81691b Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sat, 31 Dec 2016 15:53:48 +0100 Subject: [PATCH] [IMapEnts] Use IW4C if available --- .../Modules/AssetInterfaces/IMapEnts.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Components/Modules/AssetInterfaces/IMapEnts.cpp b/src/Components/Modules/AssetInterfaces/IMapEnts.cpp index 27493484..2dc7737a 100644 --- a/src/Components/Modules/AssetInterfaces/IMapEnts.cpp +++ b/src/Components/Modules/AssetInterfaces/IMapEnts.cpp @@ -17,13 +17,18 @@ namespace Assets // TODO: Get rid of that if (!orgEnts) { - Game::DB_EnumXAssets(Game::XAssetType::ASSET_TYPE_MAP_ENTS, [](Game::XAssetHeader header, void* mapEnts) + orgEnts = Components::AssetHandler::FindOriginalAsset(Game::XAssetType::ASSET_TYPE_MAP_ENTS, "maps/iw4_credits.d3dbsp").mapEnts; + + if (!orgEnts) { - if (!*reinterpret_cast(mapEnts)) + Game::DB_EnumXAssets(Game::XAssetType::ASSET_TYPE_MAP_ENTS, [](Game::XAssetHeader header, void* mapEnts) { - *reinterpret_cast(mapEnts) = header.mapEnts; - } - }, &orgEnts, false); + if (!*reinterpret_cast(mapEnts)) + { + *reinterpret_cast(mapEnts) = header.mapEnts; + } + }, &orgEnts, false); + } } if (orgEnts)