From 70dba1948408f520c5e5d76d3e40c80432cb5271 Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 23 Jan 2024 19:29:09 +0100 Subject: [PATCH 1/2] fix: do not consider a structure require marking when it contains a string member --- .../Parsing/PostProcessing/MarkingRequiredPostProcessor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/MarkingRequiredPostProcessor.cpp b/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/MarkingRequiredPostProcessor.cpp index 012f16d37..98b56c44c 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/MarkingRequiredPostProcessor.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/MarkingRequiredPostProcessor.cpp @@ -39,7 +39,7 @@ bool MarkingRequiredPostProcessor::RequiresMarking(std::unordered_setm_is_script_string || member->m_is_string || member->m_type && member->m_type->m_asset_enum_entry) + if (member->m_is_script_string || member->m_type && member->m_type->m_asset_enum_entry) return true; if (member->m_type != nullptr && member->m_type != info && RequiresMarking(visitedStructures, member->m_type)) From df2a5294e8d31929e4e701a767158793e3f149fe Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 23 Jan 2024 19:29:43 +0100 Subject: [PATCH 2/2] fix: consider structures that are assets requiring marking --- .../Parsing/PostProcessing/MarkingRequiredPostProcessor.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/MarkingRequiredPostProcessor.cpp b/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/MarkingRequiredPostProcessor.cpp index 98b56c44c..17b425585 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/MarkingRequiredPostProcessor.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/MarkingRequiredPostProcessor.cpp @@ -13,6 +13,9 @@ bool MarkingRequiredPostProcessor::RequiresMarking(std::unordered_setm_asset_enum_entry) + return true; + for (const auto& member : info->m_ordered_members) { // If there is a condition to this member, and it always evaluates to false: Skip this member