diff options
| author |   hop311 <hop3114@gmail.com> | 2024-10-27 12:56:46 +0100 |
|---|---|---|
| committer | hop311 <hop3114@gmail.com> | 2024-10-29 23:55:10 +0100 |
| commit | 9a5468ceb4361059fcefae1a383a7c29b4f4e7be (patch) | |
| tree | 4ff826fd008548cb79f71df83c422388a24de0da /src/openvic-simulation/economy | |
| parent | 309deb6a5b28c8e2b24e73d06f1418bb992b4cd7 (diff) | |
Rename `scope_t` enum to `scope_type_t`
Diffstat (limited to 'src/openvic-simulation/economy')
| -rw-r--r-- | src/openvic-simulation/economy/production/ProductionType.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/openvic-simulation/economy/production/ProductionType.cpp b/src/openvic-simulation/economy/production/ProductionType.cpp index 7c4dfef..874ec61 100644 --- a/src/openvic-simulation/economy/production/ProductionType.cpp +++ b/src/openvic-simulation/economy/production/ProductionType.cpp @@ -254,13 +254,18 @@ bool ProductionTypeManager::load_production_types_file( auto parse_node = expect_dictionary_keys( "template", ZERO_OR_ONE, success_callback, /* Already parsed using expect_key in Pass #1 above. */ "bonus", ZERO_OR_MORE, [&bonuses](ast::NodeCPtr bonus_node) -> bool { - ConditionScript trigger { scope_t::STATE, scope_t::NO_SCOPE, scope_t::NO_SCOPE }; + using enum scope_type_t; + + ConditionScript trigger { STATE, NO_SCOPE, NO_SCOPE }; fixed_point_t bonus_value {}; + const bool ret = expect_dictionary_keys( "trigger", ONE_EXACTLY, trigger.expect_script(), "value", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(bonus_value)) )(bonus_node); + bonuses.emplace_back(std::move(trigger), bonus_value); + return ret; }, "owner", ZERO_OR_ONE, _expect_job(good_definition_manager, pop_manager, move_variable_callback(owner)), |