aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/InstanceManager.cpp
diff options
context:
space:
mode:
author Hop311 <Hop3114@gmail.com>2024-07-04 10:38:54 +0200
committer GitHub <noreply@github.com>2024-07-04 10:38:54 +0200
commit8c8b9349e26b4f606e18810a201ff378eaac19b2 (patch)
treec8d10e8c2b38208401f30e9b3acf7fc4a071583f /src/openvic-simulation/InstanceManager.cpp
parentbfd539513af435564daf70f94f6cce146dd5c948 (diff)
parent326db6b4779bf3662752243d929ff3d605870049 (diff)
Merge pull request #167 from OpenVicProject/country-definition
Renamed Country to CountryDefinition
Diffstat (limited to 'src/openvic-simulation/InstanceManager.cpp')
-rw-r--r--src/openvic-simulation/InstanceManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/InstanceManager.cpp b/src/openvic-simulation/InstanceManager.cpp
index 659931c..7ee5fb8 100644
--- a/src/openvic-simulation/InstanceManager.cpp
+++ b/src/openvic-simulation/InstanceManager.cpp
@@ -98,11 +98,11 @@ bool InstanceManager::load_bookmark(Bookmark const* new_bookmark) {
// TODO - the following arguments are for generating test pop attributes
definition_manager.get_politics_manager().get_ideology_manager(),
definition_manager.get_politics_manager().get_issue_manager(),
- *definition_manager.get_country_manager().get_country_by_identifier("ENG")
+ *definition_manager.get_country_definition_manager().get_country_definition_by_identifier("ENG")
);
ret &= map_instance.get_state_manager().generate_states(map_instance);
- ret &= country_instance_manager.generate_country_instances(definition_manager.get_country_manager());
+ ret &= country_instance_manager.generate_country_instances(definition_manager.get_country_definition_manager());
ret &= country_instance_manager.apply_history_to_countries(
definition_manager.get_history_manager().get_country_manager(), today, unit_instance_manager, map_instance
);