Merge pull request #98 from OpenVic2Project/some-cleanup

Req comments + cleanup + c++ registry refactoring

1 files changed, 8 insertions, 3 deletions

diff --git a/extension/src/openvic2/map/Province.hpp b/extension/src/openvic2/map/Province.hpp
index 79c6861..aa0329c 100644
--- a/extension/src/openvic2/map/Province.hpp
+++ b/extension/src/openvic2/map/Province.hpp
@@ -19,22 +19,27 @@ namespace OpenVic2 {
 		static constexpr colour_t NULL_COLOUR = 0, MAX_COLOUR = 0xFFFFFF;
 		static constexpr index_t NULL_INDEX = 0, MAX_INDEX = 0xFFFF;
 	private:
-		index_t index;
-		colour_t colour;
+		const index_t index;
+		const colour_t colour;
 		Region* region = nullptr;
 		bool water = false;
 		life_rating_t life_rating = 0;
-		std::vector<Building> buildings;
+		IdentifierRegistry<Building> buildings;
 
 		Province(index_t new_index, std::string const& new_identifier, colour_t new_colour);
 	public:
 		static std::string colour_to_hex_string(colour_t colour);
 
+		Province(Province&&) = default;
+
 		index_t get_index() const;
 		colour_t get_colour() const;
 		Region* get_region() const;
 		bool is_water() const;
 		life_rating_t get_life_rating() const;
+		return_t add_building(BuildingType const& type);
+		void lock_buildings();
+		void reset_buildings();
 		std::vector<Building> const& get_buildings() const;
 		return_t expand_building(std::string const& building_type_identifier);
 		std::string to_string() const;