zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-07-11 05:31:51 +00:00
Code Activity

fix: make name of zone definition the target name by default

Browse Source
This commit is contained in:
Jan
2024-11-12 18:18:04 +01:00
parent aa8300052a
commit 2034db3330
8 changed files with 236 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,8 +7,8 @@
#include "Sequence/SequenceZoneDefinitionInclude.h"
#include "Sequence/SequenceZoneDefinitionMetaData.h"
ZoneDefinitionParser::ZoneDefinitionParser(ZoneDefinitionLexer* lexer, const std::optional<GameId> maybeGame)
: AbstractParser(lexer, std::make_unique<ZoneDefinitionParserState>())
ZoneDefinitionParser::ZoneDefinitionParser(ZoneDefinitionLexer* lexer, std::string targetName, const std::optional<GameId> maybeGame)
: AbstractParser(lexer, std::make_unique<ZoneDefinitionParserState>(std::move(targetName)))
{
if (maybeGame)
m_state->SetGame(*maybeGame);

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

@ -15,6 +15,6 @@ protected:
const std::vector<sequence_t*>& GetTestsForState() override;
public:
explicit ZoneDefinitionParser(ZoneDefinitionLexer* lexer, std::optional<GameId> maybeGame = std::nullopt);
ZoneDefinitionParser(ZoneDefinitionLexer* lexer, std::string targetName, std::optional<GameId> maybeGame = std::nullopt);
std::unique_ptr<ZoneDefinition> GetParsedValue();
};

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

@ -1,9 +1,10 @@
#include "ZoneDefinitionParserState.h"
ZoneDefinitionParserState::ZoneDefinitionParserState()
ZoneDefinitionParserState::ZoneDefinitionParserState(std::string targetName)
: m_asset_name_resolver(nullptr),
m_definition(std::make_unique<ZoneDefinition>())
{
m_definition->m_name = std::move(targetName);
}
void ZoneDefinitionParserState::SetGame(const GameId game)

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

@ -8,7 +8,7 @@
class ZoneDefinitionParserState
{
public:
ZoneDefinitionParserState();
explicit ZoneDefinitionParserState(std::string targetName);
void SetGame(GameId game);