From 271c819e976cf522783220208c4f8d45c132a153 Mon Sep 17 00:00:00 2001 From: Jan Date: Thu, 14 Nov 2019 15:35:19 +0100 Subject: [PATCH] ZoneLoading: Enable further easy assets like qdb, slug, localize, scriptparsetree --- src/ZoneCommon/Game/T6/T6_Assets.h | 4 ++-- src/ZoneLoading/Game/T6/ContentLoaderT6.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ZoneCommon/Game/T6/T6_Assets.h b/src/ZoneCommon/Game/T6/T6_Assets.h index 96e46fed..e8b6bab4 100644 --- a/src/ZoneCommon/Game/T6/T6_Assets.h +++ b/src/ZoneCommon/Game/T6/T6_Assets.h @@ -1899,7 +1899,7 @@ struct ScriptParseTree { const char *name; int len; - char *buffer; + byte32 *buffer; }; struct KeyValuePairs @@ -2319,7 +2319,7 @@ struct Slug { const char *name; int len; - char *buffer; + byte32* buffer; }; struct FootstepTableDef diff --git a/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp b/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp index cc5ebbb1..26c0cb5d 100644 --- a/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp +++ b/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp @@ -127,7 +127,7 @@ void ContentLoaderT6::LoadXAsset(const bool atStreamStart) // LOAD_ASSET(ASSET_TYPE_FONTICON, FontIcon, fontIcon); // LOAD_ASSET(ASSET_TYPE_MENULIST, MenuList, menuList); // LOAD_ASSET(ASSET_TYPE_MENU, menuDef_t, menu); - // LOAD_ASSET(ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry, localize); + LOAD_ASSET(ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry, localize); // LOAD_ASSET(ASSET_TYPE_WEAPON, WeaponVariantDef, weapon); // LOAD_ASSET(ASSET_TYPE_ATTACHMENT, WeaponAttachment, attachment); // LOAD_ASSET(ASSET_TYPE_ATTACHMENT_UNIQUE, WeaponAttachmentUnique, attachmentUnique); @@ -149,8 +149,8 @@ void ContentLoaderT6::LoadXAsset(const bool atStreamStart) // LOAD_ASSET(ASSET_TYPE_ADDON_MAP_ENTS, AddonMapEnts, addonMapEnts); // LOAD_ASSET(ASSET_TYPE_TRACER, TracerDef, tracerDef); // LOAD_ASSET(ASSET_TYPE_SKINNEDVERTS, SkinnedVertsDef, skinnedVertsDef); - // LOAD_ASSET(ASSET_TYPE_QDB, Qdb, qdb); - // LOAD_ASSET(ASSET_TYPE_SLUG, Slug, slug); + LOAD_ASSET(ASSET_TYPE_QDB, Qdb, qdb); + LOAD_ASSET(ASSET_TYPE_SLUG, Slug, slug); // LOAD_ASSET(ASSET_TYPE_FOOTSTEP_TABLE, FootstepTableDef, footstepTableDef); // LOAD_ASSET(ASSET_TYPE_FOOTSTEPFX_TABLE, FootstepFXTableDef, footstepFXTableDef); // LOAD_ASSET(ASSET_TYPE_ZBARRIER, ZBarrierDef, zbarrierDef);