diff --git a/src/ObjLoading/AssetLoading/BasicAssetLoader.h b/src/ObjLoading/AssetLoading/BasicAssetLoader.h index f9a80653..0f74428d 100644 --- a/src/ObjLoading/AssetLoading/BasicAssetLoader.h +++ b/src/ObjLoading/AssetLoading/BasicAssetLoader.h @@ -2,17 +2,22 @@ #include "IAssetLoader.h" #include "Pool/GlobalAssetPool.h" +template +class BasicAssetLoaderWithoutType : public IAssetLoader +{ +public: + _NODISCARD XAssetInfoGeneric* LoadFromGlobalAssetPools(const std::string& assetName) const override + { + return GlobalAssetPool::GetAssetByName(assetName); + } +}; + template -class BasicAssetLoader : public IAssetLoader +class BasicAssetLoader : public BasicAssetLoaderWithoutType { public: _NODISCARD asset_type_t GetHandlingAssetType() const override { return AssetType; } - - _NODISCARD XAssetInfoGeneric* LoadFromGlobalAssetPools(const std::string& assetName) const override - { - return GlobalAssetPool::GetAssetByName(assetName); - } }; diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderClipMap.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderClipMap.h index a0ced2d6..4e730971 100644 --- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderClipMap.h +++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderClipMap.h @@ -6,7 +6,7 @@ namespace IW4 { - class AssetLoaderClipMap : public BasicAssetLoader + class AssetLoaderClipMap : public BasicAssetLoaderWithoutType { _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; };