diff options
author | Hop311 <Hop3114@gmail.com> | 2024-06-13 01:25:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-13 01:25:21 +0200 |
commit | 01a8f60aaca9784d814f4cb35a3fc4be86e1dd20 (patch) | |
tree | ebc9c03b5bd0a6b11068ac37aca302f6ceb24a18 /src/openvic-simulation/map/ProvinceInstance.cpp | |
parent | a49e4d0975e2b5dfd13ae50aa716f1a0307e618d (diff) | |
parent | c0ba822ee46551a40ad6b43e8f56b80e27ae35b5 (diff) |
Merge pull request #163 from OpenVicProject/good-instance
Add GoodInstance
Diffstat (limited to 'src/openvic-simulation/map/ProvinceInstance.cpp')
-rw-r--r-- | src/openvic-simulation/map/ProvinceInstance.cpp | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/openvic-simulation/map/ProvinceInstance.cpp b/src/openvic-simulation/map/ProvinceInstance.cpp index ba52280..be77d6e 100644 --- a/src/openvic-simulation/map/ProvinceInstance.cpp +++ b/src/openvic-simulation/map/ProvinceInstance.cpp @@ -8,11 +8,27 @@ using namespace OpenVic; ProvinceInstance::ProvinceInstance(ProvinceDefinition const& new_province_definition) - : HasIdentifier { new_province_definition.get_identifier() }, province_definition { new_province_definition }, - terrain_type { nullptr }, life_rating { 0 }, colony_status { colony_status_t::STATE }, state { nullptr }, - owner { nullptr }, controller { nullptr }, cores {}, slave { false }, crime { nullptr }, rgo { nullptr }, - buildings { "buildings", false }, armies {}, navies {}, pops {}, total_population { 0 }, pop_type_distribution {}, - ideology_distribution {}, culture_distribution {}, religion_distribution {} {} + : HasIdentifierAndColour { new_province_definition }, + province_definition { new_province_definition }, + terrain_type { nullptr }, + life_rating { 0 }, + colony_status { colony_status_t::STATE }, + state { nullptr }, + owner { nullptr }, + controller { nullptr }, + cores {}, + slave { false }, + crime { nullptr }, + rgo { nullptr }, + buildings { "buildings", false }, + armies {}, + navies {}, + pops {}, + total_population { 0 }, + pop_type_distribution {}, + ideology_distribution {}, + culture_distribution {}, + religion_distribution {} {} bool ProvinceInstance::expand_building(size_t building_index) { BuildingInstance* building = buildings.get_item_by_index(building_index); |