Merge pull request #9 from OpenVicProject/pops

Pops and other bits

1 files changed, 9 insertions, 1 deletions

diff --git a/src/openvic/map/Province.hpp b/src/openvic/map/Province.hpp
index f1f87a2..cd90f7d 100644
--- a/src/openvic/map/Province.hpp
+++ b/src/openvic/map/Province.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "../pop/Pop.hpp"
 #include "Building.hpp"
 
 namespace OpenVic {
@@ -24,6 +25,9 @@ namespace OpenVic {
 		// TODO - change this into a factory-like structure
 		Good const* rgo = nullptr;
 
+		std::vector<Pop> pops;
+		Pop::pop_size_t total_population;
+
 		Province(index_t new_index, std::string const& new_identifier, colour_t new_colour);
 
 	public:
@@ -33,7 +37,7 @@ namespace OpenVic {
 		Region* get_region() const;
 		bool is_water() const;
 		life_rating_t get_life_rating() const;
-		return_t add_building(BuildingType const& type);
+		return_t add_building(Building&& building);
 		void lock_buildings();
 		void reset_buildings();
 		Building const* get_building_by_identifier(std::string const& identifier) const;
@@ -42,6 +46,10 @@ namespace OpenVic {
 		Good const* get_rgo() const;
 		std::string to_string() const;
 
+		void add_pop(Pop&& pop);
+		void update_total_population();
+		Pop::pop_size_t get_total_population() const;
+
 		void update_state(Date const& today);
 		void tick(Date const& today);
 	};