zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-01-19 15:01:49 +00:00
Code Activity

fix: only fill used union members when loading

Browse Source
This commit is contained in:
Jan Laupetin
2026-01-14 22:42:43 +00:00
parent 00546740e4
commit 2840489a38
1 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
View File

@@ -596,7 +596,7 @@ namespace
{
const MemberComputations computations(&member);
if (computations.IsFirstUsedMember(false))
if (computations.IsFirstUsedMember(true))
{
if (member.m_condition)
{
@@ -614,7 +614,7 @@ namespace
PrintFillStruct_Member(structInfo, member, DeclarationModifierComputations(&member), 0u);
}
}
else if (computations.IsLastUsedMember(false))
else if (computations.IsLastUsedMember(true))
{
if (member.m_condition)
{
@@ -668,9 +668,6 @@ namespace
}
const auto* dynamicMember = StructureComputations(&info).GetDynamicMember();
if (dynamicMember)
{
if (info.m_definition->GetType() == DataDefinitionType::UNION)
{
for (const auto& member : info.m_ordered_members)
@@ -693,21 +690,10 @@ namespace
PrintFillStruct_Member(info, *member, DeclarationModifierComputations(member.get()), 0u);
}
if (dynamicMember)
PrintFillStruct_Member_Condition_Struct(info, *dynamicMember);
}
}
else
{
for (const auto& member : info.m_ordered_members)
{
const MemberComputations computations(member.get());
if (computations.ShouldIgnore())
continue;
PrintFillStruct_Member(info, *member, DeclarationModifierComputations(member.get()), 0u);
}
}
}
void PrintFillStructMethod(const StructureInformation* info)
{