From 85155e033e9b03d71752626137a75f6418a5786c Mon Sep 17 00:00:00 2001 From: zaaarf Date: Sun, 10 Dec 2023 13:35:25 +0100 Subject: feat: implemented pop history loading --- src/openvic-simulation/pop/Pop.hpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/openvic-simulation/pop/Pop.hpp') diff --git a/src/openvic-simulation/pop/Pop.hpp b/src/openvic-simulation/pop/Pop.hpp index 736b77d..12daaf6 100644 --- a/src/openvic-simulation/pop/Pop.hpp +++ b/src/openvic-simulation/pop/Pop.hpp @@ -27,9 +27,8 @@ namespace OpenVic { pop_size_t PROPERTY(num_demoted); pop_size_t PROPERTY(num_migrated); - Pop(PopType const& new_type, Culture const& new_culture, Religion const& new_religion, pop_size_t new_size); - public: + Pop(PopType const& new_type, Culture const& new_culture, Religion const& new_religion, pop_size_t new_size); Pop(Pop const&) = delete; Pop(Pop&&) = default; Pop& operator=(Pop const&) = delete; @@ -111,6 +110,5 @@ namespace OpenVic { bool load_pop_type_file( std::string_view filestem, UnitManager const& unit_manager, GoodManager const& good_manager, ast::NodeCPtr root ); - bool load_pop_into_province(Province& province, std::string_view pop_type_identifier, ast::NodeCPtr pop_node) const; }; } -- cgit v1.2.3-56-ga3b1