zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-01-24 08:53:04 +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

12
src/ZoneLoading/Loading/ContentLoaderBase.cpp
View File

@@ -9,7 +9,7 @@ ContentLoaderBase::ContentLoaderBase(Zone& zone, ZoneInputStream& stream)
: varXString(nullptr),
m_zone(zone),
m_memory(zone.Memory()),
m_stream(&stream)
m_stream(stream)
{
}
@@ -18,18 +18,18 @@ void ContentLoaderBase::LoadXString(const bool atStreamStart) const
assert(varXString != nullptr);
if (atStreamStart)
m_stream->Load<const char*>(varXString);
m_stream.Load<const char*>(varXString);
if (*varXString != nullptr)
{
if (*varXString == PTR_FOLLOWING)
{
*varXString = m_stream->Alloc<const char>(alignof(const char));
m_stream->LoadNullTerminated(const_cast<char*>(*varXString));
*varXString = m_stream.Alloc<const char>(alignof(const char));
m_stream.LoadNullTerminated(const_cast<char*>(*varXString));
}
else
{
*varXString = m_stream->ConvertOffsetToPointerNative<const char>(*varXString);
*varXString = m_stream.ConvertOffsetToPointerNative<const char>(*varXString);
}
}
}
@@ -39,7 +39,7 @@ void ContentLoaderBase::LoadXStringArray(const bool atStreamStart, const size_t
assert(varXString != nullptr);
if (atStreamStart)
m_stream->Load<const char*>(varXString, count);
m_stream.Load<const char*>(varXString, count);
for (size_t index = 0; index < count; index++)
{

2
src/ZoneLoading/Loading/ContentLoaderBase.h
View File

@@ -26,5 +26,5 @@ protected:
Zone& m_zone;
MemoryManager& m_memory;
ZoneInputStream* m_stream; // TODO: Change this to reference
ZoneInputStream& m_stream;
};