From 45d66d887983177612d7cb8e715d5b28c1f87f31 Mon Sep 17 00:00:00 2001
From: hop311 <hop3114@gmail.com>
Date: Thu, 27 Jun 2024 20:28:34 +0100
Subject: Use minimal PopBase for pop history

---
 src/openvic-simulation/history/ProvinceHistory.cpp | 2 +-
 src/openvic-simulation/history/ProvinceHistory.hpp | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/openvic-simulation/history')

diff --git a/src/openvic-simulation/history/ProvinceHistory.cpp b/src/openvic-simulation/history/ProvinceHistory.cpp
index f2291e8..1fa6e90 100644
--- a/src/openvic-simulation/history/ProvinceHistory.cpp
+++ b/src/openvic-simulation/history/ProvinceHistory.cpp
@@ -214,7 +214,7 @@ bool ProvinceHistoryEntry::_load_province_pop_history(
 	return pop_manager.expect_pop_type_dictionary_reserve_length(
 		pops,
 		[this, &pop_manager, &rebel_manager, non_integer_size](PopType const& pop_type, ast::NodeCPtr pop_node) -> bool {
-			return pop_manager.load_pop_into_vector(rebel_manager, pops, pop_type, pop_node, non_integer_size);
+			return pop_manager.load_pop_bases_into_vector(rebel_manager, pops, pop_type, pop_node, non_integer_size);
 		}
 	)(root);
 }
diff --git a/src/openvic-simulation/history/ProvinceHistory.hpp b/src/openvic-simulation/history/ProvinceHistory.hpp
index d6bf150..85853d7 100644
--- a/src/openvic-simulation/history/ProvinceHistory.hpp
+++ b/src/openvic-simulation/history/ProvinceHistory.hpp
@@ -39,9 +39,7 @@ namespace OpenVic {
 		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);
 
-- 
cgit v1.2.3-56-ga3b1