From 4b39e77304094708d5c503b6a221386408cc4409 Mon Sep 17 00:00:00 2001 From: hop311 Date: Wed, 12 Jun 2024 23:24:00 +0100 Subject: Separated GameManager into Definition and Instance Managers --- src/openvic-simulation/misc/Modifier.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/openvic-simulation/misc/Modifier.cpp') diff --git a/src/openvic-simulation/misc/Modifier.cpp b/src/openvic-simulation/misc/Modifier.cpp index 992eb05..d4aaee2 100644 --- a/src/openvic-simulation/misc/Modifier.cpp +++ b/src/openvic-simulation/misc/Modifier.cpp @@ -86,8 +86,8 @@ TriggeredModifier::TriggeredModifier( std::string_view new_identifier, ModifierValue&& new_values, icon_t new_icon, ConditionScript&& new_trigger ) : Modifier { new_identifier, std::move(new_values), new_icon }, trigger { std::move(new_trigger) } {} -bool TriggeredModifier::parse_scripts(GameManager const& game_manager) { - return trigger.parse_script(false, game_manager); +bool TriggeredModifier::parse_scripts(DefinitionManager const& definition_manager) { + return trigger.parse_script(false, definition_manager); } ModifierInstance::ModifierInstance(Modifier const& modifier, Date expiry_date) @@ -356,10 +356,10 @@ bool ModifierManager::load_triggered_modifiers(ast::NodeCPtr root) { return ret; } -bool ModifierManager::parse_scripts(GameManager const& game_manager) { +bool ModifierManager::parse_scripts(DefinitionManager const& definition_manager) { bool ret = true; for (TriggeredModifier& modifier : triggered_modifiers.get_items()) { - ret &= modifier.parse_scripts(game_manager); + ret &= modifier.parse_scripts(definition_manager); } return ret; } -- cgit v1.2.3-56-ga3b1