diff options
| author |   hop311 <hop3114@gmail.com> | 2024-06-15 00:06:19 +0200 |
|---|---|---|
| committer | hop311 <hop3114@gmail.com> | 2024-06-20 20:33:02 +0200 |
| commit | 41d50b15ac978530a53ed99eea36f180e1d27b16 (patch) | |
| tree | 236036a544c54d678fc79344677566c3b060d335 /src/openvic-simulation/history/ProvinceHistory.cpp | |
| parent | bfd539513af435564daf70f94f6cce146dd5c948 (diff) | |
Renamed Country to CountryDefinitioncountry-definition
Diffstat (limited to 'src/openvic-simulation/history/ProvinceHistory.cpp')
| -rw-r--r-- | src/openvic-simulation/history/ProvinceHistory.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/openvic-simulation/history/ProvinceHistory.cpp b/src/openvic-simulation/history/ProvinceHistory.cpp index ffbda51..f2291e8 100644 --- a/src/openvic-simulation/history/ProvinceHistory.cpp +++ b/src/openvic-simulation/history/ProvinceHistory.cpp @@ -19,7 +19,7 @@ bool ProvinceHistoryMap::_load_history_entry( DefinitionManager const& definition_manager, ProvinceHistoryEntry& entry, ast::NodeCPtr root ) { BuildingTypeManager const& building_type_manager = definition_manager.get_economy_manager().get_building_type_manager(); - CountryManager const& country_manager = definition_manager.get_country_manager(); + CountryDefinitionManager const& country_definition_manager = definition_manager.get_country_definition_manager(); GoodDefinitionManager const& good_definition_manager = definition_manager.get_economy_manager().get_good_definition_manager(); IdeologyManager const& ideology_manager = definition_manager.get_politics_manager().get_ideology_manager(); @@ -53,12 +53,16 @@ bool ProvinceHistoryMap::_load_history_entry( return _load_history_sub_entry_callback(definition_manager, entry.get_date(), value, key, value); }, - "owner", ZERO_OR_ONE, - country_manager.expect_country_identifier(assign_variable_callback_pointer_opt(entry.owner, true)), - "controller", ZERO_OR_ONE, - country_manager.expect_country_identifier(assign_variable_callback_pointer_opt(entry.controller, true)), - "add_core", ZERO_OR_MORE, country_manager.expect_country_identifier(vector_callback_pointer(entry.add_cores)), - "remove_core", ZERO_OR_MORE, country_manager.expect_country_identifier( + "owner", ZERO_OR_ONE, country_definition_manager.expect_country_definition_identifier( + assign_variable_callback_pointer_opt(entry.owner, true) + ), + "controller", ZERO_OR_ONE, country_definition_manager.expect_country_definition_identifier( + assign_variable_callback_pointer_opt(entry.controller, true) + ), + "add_core", ZERO_OR_MORE, country_definition_manager.expect_country_definition_identifier( + vector_callback_pointer(entry.add_cores) + ), + "remove_core", ZERO_OR_MORE, country_definition_manager.expect_country_definition_identifier( vector_callback_pointer(entry.remove_cores) ), "colonial", ZERO_OR_ONE, |