zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-26 06:11:53 +00:00
Code Activity

refactor: merge ZoneInputStream interface with only implementation

Browse Source
This commit is contained in:
Jan
2025-05-02 18:35:44 +01:00
parent 4ce82ad63c
commit eb16dfcd00
49 changed files with 342 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp
View File

@ -68,7 +68,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; \
}
@ -134,9 +134,9 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
}
}
void ContentLoader::Load(IZoneInputStream* stream)
void ContentLoader::Load(ZoneInputStream& stream)
{
m_stream = stream;
m_stream = &stream;
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);

2
src/ZoneLoading/Game/IW3/ContentLoaderIW3.h
View File

@ -11,7 +11,7 @@ namespace IW3
public:
explicit ContentLoader(Zone& zone);
void Load(IZoneInputStream* stream) override;
void Load(ZoneInputStream& stream) override;
private:
void LoadScriptStringList(bool atStreamStart);

6
src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp
View File

@ -78,7 +78,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; \
}
@ -154,9 +154,9 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
}
}
void ContentLoader::Load(IZoneInputStream* stream)
void ContentLoader::Load(ZoneInputStream& stream)
{
m_stream = stream;
m_stream = &stream;
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);

2
src/ZoneLoading/Game/IW4/ContentLoaderIW4.h
View File

@ -11,7 +11,7 @@ namespace IW4
public:
explicit ContentLoader(Zone& zone);
void Load(IZoneInputStream* stream) override;
void Load(ZoneInputStream& stream) override;
private:
void LoadScriptStringList(bool atStreamStart);

6
src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp
View File

@ -83,7 +83,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; \
}
@ -163,9 +163,9 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
}
}
void ContentLoader::Load(IZoneInputStream* stream)
void ContentLoader::Load(ZoneInputStream& stream)
{
m_stream = stream;
m_stream = &stream;
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);

2
src/ZoneLoading/Game/IW5/ContentLoaderIW5.h
View File

@ -11,7 +11,7 @@ namespace IW5
public:
explicit ContentLoader(Zone& zone);
void Load(IZoneInputStream* stream) override;
void Load(ZoneInputStream& stream) override;
private:
void LoadScriptStringList(bool atStreamStart);

6
src/ZoneLoading/Game/T5/ContentLoaderT5.cpp
View File

@ -75,7 +75,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; \
}
@ -147,9 +147,9 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
}
}
void ContentLoader::Load(IZoneInputStream* stream)
void ContentLoader::Load(ZoneInputStream& stream)
{
m_stream = stream;
m_stream = &stream;
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);

2
src/ZoneLoading/Game/T5/ContentLoaderT5.h
View File

@ -11,7 +11,7 @@ namespace T5
public:
explicit ContentLoader(Zone& zone);
void Load(IZoneInputStream* stream) override;
void Load(ZoneInputStream& stream) override;
private:
void LoadScriptStringList(bool atStreamStart);

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

@ -91,7 +91,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; \
}
@ -176,9 +176,9 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
}
}
void ContentLoader::Load(IZoneInputStream* stream)
void ContentLoader::Load(ZoneInputStream& stream)
{
m_stream = stream;
m_stream = &stream;
m_stream->PushBlock(XFILE_BLOCK_VIRTUAL);

2
src/ZoneLoading/Game/T6/ContentLoaderT6.h
View File

@ -11,7 +11,7 @@ namespace T6
public:
explicit ContentLoader(Zone& zone);
void Load(IZoneInputStream* stream) override;
void Load(ZoneInputStream& stream) override;
private:
void LoadScriptStringList(bool atStreamStart);