diff options
author | Hop311 <Hop3114@gmail.com> | 2024-09-21 09:03:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-21 09:03:51 +0200 |
commit | e35ff8ed703b0b6a5496a21a29e0b274c6a36874 (patch) | |
tree | 68fca0f77f6b20f3e1fe98d32a5a79311cfd3edc /src/openvic-simulation/map/MapDefinition.cpp | |
parent | 118570dc7cf9ae9daf324c2aaba5a5d86fb2c330 (diff) | |
parent | 3fcdd0c7fce2de4cbe14a0cc3d6fb4c2731b93d9 (diff) |
Merge pull request #205 from OpenVicProject/modifier-typesfix-modifiers
Modifier types
Diffstat (limited to 'src/openvic-simulation/map/MapDefinition.cpp')
-rw-r--r-- | src/openvic-simulation/map/MapDefinition.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/map/MapDefinition.cpp b/src/openvic-simulation/map/MapDefinition.cpp index f3bb619..488133c 100644 --- a/src/openvic-simulation/map/MapDefinition.cpp +++ b/src/openvic-simulation/map/MapDefinition.cpp @@ -744,7 +744,7 @@ bool MapDefinition::load_climate_file(ModifierManager const& modifier_manager, a if (cur_climate == nullptr) { ModifierValue values; ret &= modifier_manager.expect_modifier_value(move_variable_callback(values))(node); - ret &= climates.add_item({ identifier, std::move(values) }); + ret &= climates.add_item({ identifier, std::move(values), Modifier::modifier_type_t::CLIMATE }); } else { ret &= expect_list_reserve_length(*cur_climate, expect_province_definition_identifier( [cur_climate, &identifier](ProvinceDefinition& province) { @@ -807,7 +807,7 @@ bool MapDefinition::load_continent_file(ModifierManager const& modifier_manager, )) )(node); - Continent continent = { identifier, std::move(values) }; + Continent continent { identifier, std::move(values), Modifier::modifier_type_t::CONTINENT }; continent.add_provinces(prov_list); continent.lock(); |