Merge pull request #75 from OpenVicProject/accumulated-changes

Accumulated changes

1 files changed, 4 insertions, 5 deletions

diff --git a/src/openvic-simulation/history/ProvinceHistory.hpp b/src/openvic-simulation/history/ProvinceHistory.hpp
index 5a18723..e4adc08 100644
--- a/src/openvic-simulation/history/ProvinceHistory.hpp
+++ b/src/openvic-simulation/history/ProvinceHistory.hpp
@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "openvic-simulation/country/Country.hpp"
-#include "openvic-simulation/economy/Building.hpp"
+#include "openvic-simulation/economy/BuildingType.hpp"
 #include "openvic-simulation/economy/Good.hpp"
 #include "openvic-simulation/history/Bookmark.hpp"
 #include "openvic-simulation/history/HistoryMap.hpp"
@@ -18,8 +18,6 @@ namespace OpenVic {
 	struct ProvinceHistoryEntry : HistoryEntry {
 		friend struct ProvinceHistoryMap;
 
-		using building_level_map_t = std::map<Building const*, Building::level_t>;
-
 	private:
 		Province const& PROPERTY(province);
 
@@ -32,8 +30,9 @@ namespace OpenVic {
 		std::optional<Good const*> PROPERTY(rgo);
 		std::optional<Province::life_rating_t> PROPERTY(life_rating);
 		std::optional<TerrainType const*> PROPERTY(terrain_type);
-		building_level_map_t PROPERTY(buildings);
-		decimal_map_t<Ideology const*> PROPERTY(party_loyalties);
+		std::map<BuildingType const*, BuildingType::level_t> PROPERTY(province_buildings);
+		std::map<BuildingType const*, BuildingType::level_t> PROPERTY(state_buildings);
+		fixed_point_map_t<Ideology const*> PROPERTY(party_loyalties);
 
 		ProvinceHistoryEntry(Province const& new_province, Date new_date);
 	};