INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-16 17:57:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use zone reference in AssetLoader

Browse Source
This commit is contained in:
Jan
2025-05-02 11:19:52 +01:00
parent 50612d117e
commit 9e940a6f53
49 changed files with 173 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ZoneLoading/Game/T6/ContentLoaderT6.cpp
View File

@ -55,8 +55,9 @@
using namespace T6;
ContentLoader::ContentLoader()
: varXAsset(nullptr),
ContentLoader::ContentLoader(Zone& zone)
: ContentLoaderBase(zone),
varXAsset(nullptr),
varScriptStringList(nullptr)
{
}
@ -77,12 +78,12 @@ void ContentLoader::LoadScriptStringList(const bool atStreamStart)
LoadXStringArray(true, varScriptStringList->count);
if (varScriptStringList->strings && varScriptStringList->count > 0)
m_zone->m_script_strings.InitializeForExistingZone(varScriptStringList->strings, static_cast<size_t>(varScriptStringList->count));
m_zone.m_script_strings.InitializeForExistingZone(varScriptStringList->strings, static_cast<size_t>(varScriptStringList->count));
}
m_stream->PopBlock();
assert(m_zone->m_script_strings.Count() <= SCR_STRING_MAX + 1);
assert(m_zone.m_script_strings.Count() <= SCR_STRING_MAX + 1);
}
void ContentLoader::LoadXAsset(const bool atStreamStart) const
@ -175,9 +176,8 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
}
}
void ContentLoader::Load(Zone* zone, IZoneInputStream* stream)
void ContentLoader::Load(IZoneInputStream* stream)
{
m_zone = zone;
m_stream = stream;
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);