INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-08 05:48:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

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 d46c31c047
commit fff00af67b
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

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

@ -525,7 +525,7 @@ namespace
} }
else 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)
} }
} }
@ -678,6 +678,19 @@ namespace
const auto* dynamicMember = StructureComputations(&info).GetDynamicMember(); const auto* dynamicMember = StructureComputations(&info).GetDynamicMember();
if (dynamicMember) if (dynamicMember)
{
if (info.m_definition->GetType() == DataDefinitionType::UNION)
{
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) for (const auto& member : info.m_ordered_members)
{ {
@ -688,11 +701,9 @@ namespace
PrintFillStruct_Member(info, *member, DeclarationModifierComputations(member.get()), 0u); PrintFillStruct_Member(info, *member, DeclarationModifierComputations(member.get()), 0u);
} }
if (info.m_definition->GetType() == DataDefinitionType::UNION)
PrintFillStruct_Member_Condition_Union(info, *dynamicMember);
else
PrintFillStruct_Member_Condition_Struct(info, *dynamicMember); PrintFillStruct_Member_Condition_Struct(info, *dynamicMember);
} }
}
else else
{ {
for (const auto& member : info.m_ordered_members) for (const auto& member : info.m_ordered_members)

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

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