zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-07-04 06:39:58 +00:00
Code Activity

refactor: make ZoneInputStream a reference in zone loading

Browse Source
This commit is contained in:
Jan
2025-05-03 16:29:36 +01:00
parent f6d7831e6e
commit 78d8fba6f8
8 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp
+8 -8
View File
@@ -73,7 +73,7 @@ void ContentLoader::LoadScriptStringList(const bool atStreamStart)
{
assert(varScriptStringList->strings == PTR_FOLLOWING);
varScriptStringList->strings = m_stream->Alloc<const char*>(4);
varScriptStringList->strings = m_stream.Alloc<const char*>(4);
varXString = varScriptStringList->strings;
LoadXStringArray(true, varScriptStringList->count);
@@ -89,7 +89,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart) const
#define LOAD_ASSET(type_index, typeName, headerEntry) \
case type_index: \
{ \
Loader_##typeName loader(m_zone, *m_stream); \
Loader_##typeName loader(m_zone, m_stream); \
loader.Load(&varXAsset->header.headerEntry); \
break; \
}
@@ -100,7 +100,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart) const
assert(varXAsset != nullptr);
if (atStreamStart)
m_stream->Load<XAsset>(varXAsset);
m_stream.Load<XAsset>(varXAsset);
switch (varXAsset->type)
{
@@ -156,7 +156,7 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
assert(varXAsset != nullptr);
if (atStreamStart)
m_stream->Load<XAsset>(varXAsset, count);
m_stream.Load<XAsset>(varXAsset, count);
for (size_t index = 0; index < count; index++)
{
@@ -170,9 +170,9 @@ void ContentLoader::Load()
XAssetList assetList{};
varXAssetList = &assetList;
FillStruct_XAssetList(m_stream->LoadWithFill(16u));
FillStruct_XAssetList(m_stream.LoadWithFill(16u));
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);
m_stream.PushBlock(XFILE_BLOCK_VIRTUAL);
varScriptStringList = &assetList.stringList;
LoadScriptStringList(false);
@@ -181,10 +181,10 @@ void ContentLoader::Load()
{
assert(assetList.assets == PTR_FOLLOWING);
assetList.assets = m_stream->Alloc<XAsset>(alignof(XAsset));
assetList.assets = m_stream.Alloc<XAsset>(alignof(XAsset));
varXAsset = assetList.assets;
LoadXAssetArray(true, assetList.assetCount);
}
m_stream->PopBlock();
m_stream.PopBlock();
}