zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-07-04 18:21:49 +00:00
Code Activity

chore: respect previously set game when including additional zone files

Browse Source
This commit is contained in:
Jan
2024-10-05 11:19:41 +01:00
parent b156c7348a
commit 1861bd689c
8 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ZoneCommon/Parsing/ZoneDefinition/Sequence/SequenceZoneDefinitionMetaData.cpp
View File

@ -1,10 +1,5 @@
#include "SequenceZoneDefinitionMetaData.h"
#include "Game/IW3/AssetNameResolverIW3.h"
#include "Game/IW4/AssetNameResolverIW4.h"
#include "Game/IW5/AssetNameResolverIW5.h"
#include "Game/T5/AssetNameResolverT5.h"
#include "Game/T6/AssetNameResolverT6.h"
#include "Parsing/ZoneDefinition/Matcher/ZoneDefinitionMatcherFactory.h"
#include "Utils/StringUtils.h"
@ -64,7 +59,7 @@ void SequenceZoneDefinitionMetaData::ProcessMatch(ZoneDefinitionParserState* sta
const auto& keyToken = result.NextCapture(CAPTURE_KEY);
auto key = keyToken.FieldValue();
const auto& valueToken = result.NextCapture(CAPTURE_VALUE);
const auto& value = result.NextCapture(CAPTURE_VALUE).FieldValue();
const auto& value = valueToken.FieldValue();
utils::MakeStringLowerCase(key);
@ -78,8 +73,7 @@ void SequenceZoneDefinitionMetaData::ProcessMatch(ZoneDefinitionParserState* sta
if (previousGame != GameId::COUNT && previousGame != *game)
throw ParsingException(valueToken.GetPos(), std::format("Game was previously defined as: {}", GameId_Names[static_cast<unsigned>(previousGame)]));
state->m_definition->m_game = *game;
state->m_asset_name_resolver = IAssetNameResolver::GetResolverForGame(*game);
state->SetGame(*game);
}
else if (key == METADATA_GDT)
{

4
src/ZoneCommon/Parsing/ZoneDefinition/ZoneDefinitionParser.cpp
View File

@ -7,9 +7,11 @@
#include "Sequence/SequenceZoneDefinitionInclude.h"
#include "Sequence/SequenceZoneDefinitionMetaData.h"
ZoneDefinitionParser::ZoneDefinitionParser(ZoneDefinitionLexer* lexer)
ZoneDefinitionParser::ZoneDefinitionParser(ZoneDefinitionLexer* lexer, const std::optional<GameId> maybeGame)
: AbstractParser(lexer, std::make_unique<ZoneDefinitionParserState>())
{
if (maybeGame)
m_state->SetGame(*maybeGame);
}
const std::vector<AbstractParser<ZoneDefinitionParserValue, ZoneDefinitionParserState>::sequence_t*>& ZoneDefinitionParser::GetTestsForState()

5
src/ZoneCommon/Parsing/ZoneDefinition/ZoneDefinitionParser.h
View File

@ -1,17 +1,20 @@
#pragma once
#include "Game/IGame.h"
#include "Parsing/Impl/AbstractParser.h"
#include "Zone/Definition/ZoneDefinition.h"
#include "ZoneDefinitionLexer.h"
#include "ZoneDefinitionParserState.h"
#include "ZoneDefinitionParserValue.h"
#include <optional>
class ZoneDefinitionParser final : public AbstractParser<ZoneDefinitionParserValue, ZoneDefinitionParserState>
{
protected:
const std::vector<sequence_t*>& GetTestsForState() override;
public:
explicit ZoneDefinitionParser(ZoneDefinitionLexer* lexer);
explicit ZoneDefinitionParser(ZoneDefinitionLexer* lexer, std::optional<GameId> maybeGame = std::nullopt);
std::unique_ptr<ZoneDefinition> GetParsedValue();
};

6
src/ZoneCommon/Parsing/ZoneDefinition/ZoneDefinitionParserState.cpp
View File

@ -5,3 +5,9 @@ ZoneDefinitionParserState::ZoneDefinitionParserState()
m_definition(std::make_unique<ZoneDefinition>())
{
}
void ZoneDefinitionParserState::SetGame(const GameId game)
{
m_definition->m_game = game;
m_asset_name_resolver = IAssetNameResolver::GetResolverForGame(game);
}

2
src/ZoneCommon/Parsing/ZoneDefinition/ZoneDefinitionParserState.h
View File

@ -10,6 +10,8 @@ class ZoneDefinitionParserState
public:
ZoneDefinitionParserState();
void SetGame(GameId game);
const IAssetNameResolver* m_asset_name_resolver;
std::unique_ptr<ZoneDefinition> m_definition;
};