diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-07-04 10:38:54 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-07-04 10:38:54 +0200 |
| commit | 8c8b9349e26b4f606e18810a201ff378eaac19b2 (patch) | |
| tree | c8d10e8c2b38208401f30e9b3acf7fc4a071583f /src/openvic-simulation/history/ProvinceHistory.hpp | |
| parent | bfd539513af435564daf70f94f6cce146dd5c948 (diff) | |
| parent | 326db6b4779bf3662752243d929ff3d605870049 (diff) | |
Merge pull request #167 from OpenVicProject/country-definition
Renamed Country to CountryDefinition
Diffstat (limited to 'src/openvic-simulation/history/ProvinceHistory.hpp')
| -rw-r--r-- | src/openvic-simulation/history/ProvinceHistory.hpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/openvic-simulation/history/ProvinceHistory.hpp b/src/openvic-simulation/history/ProvinceHistory.hpp index 7c283f4..85853d7 100644 --- a/src/openvic-simulation/history/ProvinceHistory.hpp +++ b/src/openvic-simulation/history/ProvinceHistory.hpp @@ -15,7 +15,7 @@ namespace OpenVic { struct ProvinceHistoryMap; struct ProvinceDefinition; - struct Country; + struct CountryDefinition; struct GoodDefinition; struct TerrainType; struct Ideology; @@ -27,21 +27,19 @@ namespace OpenVic { private: ProvinceDefinition const& PROPERTY(province); - std::optional<Country const*> PROPERTY(owner); - std::optional<Country const*> PROPERTY(controller); + std::optional<CountryDefinition const*> PROPERTY(owner); + std::optional<CountryDefinition const*> PROPERTY(controller); std::optional<ProvinceInstance::colony_status_t> PROPERTY(colonial); std::optional<bool> PROPERTY(slave); - std::vector<Country const*> PROPERTY(add_cores); - std::vector<Country const*> PROPERTY(remove_cores); + std::vector<CountryDefinition const*> PROPERTY(add_cores); + std::vector<CountryDefinition const*> PROPERTY(remove_cores); std::optional<GoodDefinition const*> PROPERTY(rgo); std::optional<ProvinceInstance::life_rating_t> PROPERTY(life_rating); std::optional<TerrainType const*> PROPERTY(terrain_type); ordered_map<BuildingType const*, BuildingType::level_t> PROPERTY(province_buildings); ordered_map<BuildingType const*, BuildingType::level_t> PROPERTY(state_buildings); fixed_point_map_t<Ideology const*> PROPERTY(party_loyalties); - - // TODO - use minimal pop representation (size, type, culture, religion, consciousness, militancy, rebel type) - std::vector<Pop> PROPERTY(pops); + std::vector<PopBase> PROPERTY(pops); ProvinceHistoryEntry(ProvinceDefinition const& new_province, Date new_date); |