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/research/Invention.cpp | |
| parent | 309deb6a5b28c8e2b24e73d06f1418bb992b4cd7 (diff) | |
Rename `scope_t` enum to `scope_type_t`
Diffstat (limited to 'src/openvic-simulation/research/Invention.cpp')
| -rw-r--r-- | src/openvic-simulation/research/Invention.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/openvic-simulation/research/Invention.cpp b/src/openvic-simulation/research/Invention.cpp index 1076a62..4351337 100644 --- a/src/openvic-simulation/research/Invention.cpp +++ b/src/openvic-simulation/research/Invention.cpp @@ -62,6 +62,8 @@ bool InventionManager::load_inventions_file( inventions, [this, &modifier_manager, &unit_type_manager, &building_type_manager, &crime_manager]( std::string_view identifier, ast::NodeCPtr value ) -> bool { + using enum scope_type_t; + // TODO - use the same variable for all modifiers rather than combining them at the end? ModifierValue loose_modifiers; ModifierValue modifiers; @@ -74,8 +76,8 @@ bool InventionManager::load_inventions_file( bool unlock_gas_defence = false; bool news = true; //defaults to true! - ConditionScript limit { scope_t::COUNTRY, scope_t::COUNTRY, scope_t::NO_SCOPE }; - ConditionalWeight chance { scope_t::COUNTRY, scope_t::COUNTRY, scope_t::NO_SCOPE }; + ConditionScript limit { COUNTRY, COUNTRY, NO_SCOPE }; + ConditionalWeight chance { COUNTRY, COUNTRY, NO_SCOPE }; bool ret = NodeTools::expect_dictionary_keys_and_default( modifier_manager.expect_base_country_modifier(loose_modifiers), |