diff options
Diffstat (limited to 'src/openvic-simulation/history/ProvinceHistory.hpp')
| -rw-r--r-- | src/openvic-simulation/history/ProvinceHistory.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/openvic-simulation/history/ProvinceHistory.hpp b/src/openvic-simulation/history/ProvinceHistory.hpp index 7c283f4..d6bf150 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,12 +27,12 @@ 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); |