From 0d801948bc0c1110f4900c45d8f19ef143dcfdf5 Mon Sep 17 00:00:00 2001 From: Jan Date: Mon, 23 Dec 2019 17:05:53 +0100 Subject: [PATCH] ZoneLoading: Enable now properly working assets --- src/ZoneLoading/Game/T6/ContentLoaderT6.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp b/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp index c21fa794..97bd1ae2 100644 --- a/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp +++ b/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp @@ -115,15 +115,15 @@ void ContentLoaderT6::LoadXAsset(const bool atStreamStart) LOAD_ASSET(ASSET_TYPE_PHYSPRESET, PhysPreset, physPreset); LOAD_ASSET(ASSET_TYPE_PHYSCONSTRAINTS, PhysConstraints, physConstraints); LOAD_ASSET(ASSET_TYPE_DESTRUCTIBLEDEF, DestructibleDef, destructibleDef); - // LOAD_ASSET(ASSET_TYPE_XANIMPARTS, XAnimParts, parts); + LOAD_ASSET(ASSET_TYPE_XANIMPARTS, XAnimParts, parts); LOAD_ASSET(ASSET_TYPE_XMODEL, XModel, model); LOAD_ASSET(ASSET_TYPE_MATERIAL, Material, material); - // LOAD_ASSET(ASSET_TYPE_TECHNIQUE_SET, MaterialTechniqueSet, techniqueSet); - // LOAD_ASSET(ASSET_TYPE_IMAGE, GfxImage, image); + LOAD_ASSET(ASSET_TYPE_TECHNIQUE_SET, MaterialTechniqueSet, techniqueSet); + LOAD_ASSET(ASSET_TYPE_IMAGE, GfxImage, image); LOAD_ASSET(ASSET_TYPE_SOUND, SndBank, sound); LOAD_ASSET(ASSET_TYPE_SOUND_PATCH, SndPatch, soundPatch); - // LOAD_ASSET(ASSET_TYPE_CLIPMAP, clipMap_t, clipMap); - // LOAD_ASSET(ASSET_TYPE_CLIPMAP_PVS, clipMap_t, clipMap); + LOAD_ASSET(ASSET_TYPE_CLIPMAP, clipMap_t, clipMap); + LOAD_ASSET(ASSET_TYPE_CLIPMAP_PVS, clipMap_t, clipMap); LOAD_ASSET(ASSET_TYPE_COMWORLD, ComWorld, comWorld); LOAD_ASSET(ASSET_TYPE_GAMEWORLD_SP, GameWorldSp, gameWorldSp); LOAD_ASSET(ASSET_TYPE_GAMEWORLD_MP, GameWorldMp, gameWorldMp);