From b5bbeb47febc823517a5baba4eca66f32fb3609c Mon Sep 17 00:00:00 2001 From: hop311 Date: Sat, 4 Nov 2023 18:44:38 +0000 Subject: Cross-platform file lookup (case and separator) --- src/openvic-simulation/map/Province.hpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/openvic-simulation/map/Province.hpp') diff --git a/src/openvic-simulation/map/Province.hpp b/src/openvic-simulation/map/Province.hpp index 6c022b7..2fd15c9 100644 --- a/src/openvic-simulation/map/Province.hpp +++ b/src/openvic-simulation/map/Province.hpp @@ -3,6 +3,7 @@ #include #include "openvic-simulation/economy/Building.hpp" +#include "openvic-simulation/politics/Ideology.hpp" #include "openvic-simulation/pop/Pop.hpp" namespace OpenVic { @@ -72,7 +73,10 @@ namespace OpenVic { std::vector pops; Pop::pop_size_t total_population; - distribution_t pop_types, cultures, religions; + decimal_map_t PROPERTY(pop_type_distribution); + decimal_map_t PROPERTY(ideology_distribution); + decimal_map_t PROPERTY(culture_distribution); + decimal_map_t PROPERTY(religion_distribution); std::vector adjacencies; province_positions_t positions; @@ -109,9 +113,6 @@ namespace OpenVic { size_t get_pop_count() const; std::vector const& get_pops() const; Pop::pop_size_t get_total_population() const; - distribution_t const& get_pop_type_distribution() const; - distribution_t const& get_culture_distribution() const; - distribution_t const& get_religion_distribution() const; void update_pops(); void update_state(Date today); -- cgit v1.2.3-56-ga3b1