diff options
Diffstat (limited to 'src/openvic-simulation/map')
-rw-r--r-- | src/openvic-simulation/map/MapInstance.cpp | 2 | ||||
-rw-r--r-- | src/openvic-simulation/map/ProvinceInstance.cpp | 5 | ||||
-rw-r--r-- | src/openvic-simulation/map/ProvinceInstance.hpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/openvic-simulation/map/MapInstance.cpp b/src/openvic-simulation/map/MapInstance.cpp index f428263..3617f4a 100644 --- a/src/openvic-simulation/map/MapInstance.cpp +++ b/src/openvic-simulation/map/MapInstance.cpp @@ -116,7 +116,7 @@ bool MapInstance::apply_history_to_provinces( } if(rgo_production_type != nullptr) { - province.setup_rgo(*rgo_production_type); + province.initialise_for_new_game(*rgo_production_type); } } } diff --git a/src/openvic-simulation/map/ProvinceInstance.cpp b/src/openvic-simulation/map/ProvinceInstance.cpp index e2128ed..5d497c5 100644 --- a/src/openvic-simulation/map/ProvinceInstance.cpp +++ b/src/openvic-simulation/map/ProvinceInstance.cpp @@ -330,10 +330,9 @@ bool ProvinceInstance::apply_history_to_province(ProvinceHistoryEntry const& ent return ret; } -void ProvinceInstance::setup_rgo(ProductionType const& rgo_production_type) { +void ProvinceInstance::initialise_for_new_game(ProductionType const& rgo_production_type) { convert_rgo_worker_pops_to_equivalent(rgo_production_type); - rgo.set_production_type(&rgo_production_type); - rgo.update_size(*this); + rgo.initialise_for_new_game(*this,rgo_production_type); } void ProvinceInstance::setup_pop_test_values(IssueManager const& issue_manager) { diff --git a/src/openvic-simulation/map/ProvinceInstance.hpp b/src/openvic-simulation/map/ProvinceInstance.hpp index 7e2754f..cea1c0a 100644 --- a/src/openvic-simulation/map/ProvinceInstance.hpp +++ b/src/openvic-simulation/map/ProvinceInstance.hpp @@ -140,7 +140,7 @@ namespace OpenVic { bool apply_history_to_province(ProvinceHistoryEntry const& entry, CountryInstanceManager& country_manager); //after history and pops! - void setup_rgo(ProductionType const& rgo_production_type); + void initialise_for_new_game(ProductionType const& rgo_production_type); void setup_pop_test_values(IssueManager const& issue_manager); }; |