From c245daf56eb210de5536f0fcd96857fb26756eba Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 8 Oct 2024 20:10:40 +0200 Subject: [PATCH 1/2] fix: loaded zone definitions do not set type fastfile if undefined --- src/Linker/Linker.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Linker/Linker.cpp b/src/Linker/Linker.cpp index 1622e89d..421022df 100644 --- a/src/Linker/Linker.cpp +++ b/src/Linker/Linker.cpp @@ -157,6 +157,10 @@ class LinkerImpl final : public Linker return nullptr; } + // If no type was defined explicitly make it fastfile + if (zoneDefinition->m_type == ProjectType::NONE) + zoneDefinition->m_type = ProjectType::FASTFILE; + if (!IncludeAdditionalZoneDefinitions(targetName, *zoneDefinition, sourceSearchPath)) return nullptr; From 9f9e20988a6a1c7310be1e00564a1e5b27b0dba1 Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 8 Oct 2024 20:11:15 +0200 Subject: [PATCH 2/2] fix: zone def loader not taking correct token for asset name --- .../ZoneDefinition/Sequence/SequenceZoneDefinitionEntry.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ZoneCommon/Parsing/ZoneDefinition/Sequence/SequenceZoneDefinitionEntry.cpp b/src/ZoneCommon/Parsing/ZoneDefinition/Sequence/SequenceZoneDefinitionEntry.cpp index d73fad05..d335df3a 100644 --- a/src/ZoneCommon/Parsing/ZoneDefinition/Sequence/SequenceZoneDefinitionEntry.cpp +++ b/src/ZoneCommon/Parsing/ZoneDefinition/Sequence/SequenceZoneDefinitionEntry.cpp @@ -32,10 +32,10 @@ void SequenceZoneDefinitionEntry::ProcessMatch(ZoneDefinitionParserState* state, const auto& assetNameToken = result.NextCapture(CAPTURE_ASSET_NAME); std::string assetName; - if (typeNameToken.m_type == ZoneDefinitionParserValueType::STRING) - assetName = typeNameToken.StringValue(); + if (assetNameToken.m_type == ZoneDefinitionParserValueType::STRING) + assetName = assetNameToken.StringValue(); else - assetName = typeNameToken.FieldValue(); + assetName = assetNameToken.FieldValue(); state->m_definition->m_assets.emplace_back(*maybeAssetType, assetName, result.NextTag() == TAG_REFERENCE); }