zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 00:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #279 from Laupetin/fix/zone-def-loading

Browse Source 
fix: zone def loading
This commit is contained in:
Jan 2024-10-08 20:52:49 +02:00 committed by GitHub
commit 038ed9a37a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Linker/Linker.cpp
View File

@ -157,6 +157,10 @@ class LinkerImpl final : public Linker
return nullptr; 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)) if (!IncludeAdditionalZoneDefinitions(targetName, *zoneDefinition, sourceSearchPath))
return nullptr; return nullptr;

6
src/ZoneCommon/Parsing/ZoneDefinition/Sequence/SequenceZoneDefinitionEntry.cpp
View File

@ -32,10 +32,10 @@ void SequenceZoneDefinitionEntry::ProcessMatch(ZoneDefinitionParserState* state,
const auto& assetNameToken = result.NextCapture(CAPTURE_ASSET_NAME); const auto& assetNameToken = result.NextCapture(CAPTURE_ASSET_NAME);
std::string assetName; std::string assetName;
if (typeNameToken.m_type == ZoneDefinitionParserValueType::STRING) if (assetNameToken.m_type == ZoneDefinitionParserValueType::STRING)
assetName = typeNameToken.StringValue(); assetName = assetNameToken.StringValue();
else else
assetName = typeNameToken.FieldValue(); assetName = assetNameToken.FieldValue();
state->m_definition->m_assets.emplace_back(*maybeAssetType, assetName, result.NextTag() == TAG_REFERENCE); state->m_definition->m_assets.emplace_back(*maybeAssetType, assetName, result.NextTag() == TAG_REFERENCE);
} }