zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-20 19:35:41 +00:00
Code

fix: dynamic fill loading missing conditions on unions

Browse Source
This commit is contained in:
Jan 2025-06-04 18:56:52 +01:00
parent fe1bbce7aa
commit 884ad57bf4
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -525,7 +525,7 @@ namespace
}
else
{
LINEF("#error Unsupported anonymous struct with name: {0}", memberInfo.m_member->m_name);
LINEF("#error Unsupported anonymous struct with name: {0}", memberInfo.m_member->m_name)
}
}
@ -679,19 +679,30 @@ namespace
if (dynamicMember)
{
for (const auto& member : info.m_ordered_members)
{
const MemberComputations computations(member.get());
if (computations.ShouldIgnore() || member.get() == dynamicMember)
continue;
PrintFillStruct_Member(info, *member, DeclarationModifierComputations(member.get()), 0u);
}
if (info.m_definition->GetType() == DataDefinitionType::UNION)
PrintFillStruct_Member_Condition_Union(info, *dynamicMember);
{
for (const auto& member : info.m_ordered_members)
{
const MemberComputations computations(member.get());
if (computations.ShouldIgnore())
continue;
PrintFillStruct_Member_Condition_Union(info, *member);
}
}
else
{
for (const auto& member : info.m_ordered_members)
{
const MemberComputations computations(member.get());
if (computations.ShouldIgnore() || member.get() == dynamicMember)
continue;
PrintFillStruct_Member(info, *member, DeclarationModifierComputations(member.get()), 0u);
}
PrintFillStruct_Member_Condition_Struct(info, *dynamicMember);
}
}
else
{

2
src/ZoneLoading/Zone/Stream/ZoneInputStream.h
View File

@ -11,7 +11,7 @@
#include <type_traits>
#include <vector>
#define DEBUG_OFFSETS 1
// #define DEBUG_OFFSETS 1
class ZoneStreamFillReadAccessor
{