Merge pull request #148 from OpenVicProject/region-colours

Regions are now coloured from colors.txt

1 files changed, 3 insertions, 2 deletions

diff --git a/src/openvic-simulation/map/Map.hpp b/src/openvic-simulation/map/Map.hpp
index a472a6c..e2c4bd6 100644
--- a/src/openvic-simulation/map/Map.hpp
+++ b/src/openvic-simulation/map/Map.hpp
@@ -116,7 +116,7 @@ namespace OpenVic {
 		Province* get_selected_province();
 		Province::index_t get_selected_province_index() const;
 
-		bool add_region(std::string_view identifier, Region::provinces_t const& provinces);
+		bool add_region(std::string_view identifier, Region::provinces_t const& provinces, colour_t colour);
 
 		bool add_mapmode(std::string_view identifier, Mapmode::colour_func_t colour_func);
 
@@ -139,7 +139,8 @@ namespace OpenVic {
 		bool load_province_definitions(std::vector<ovdl::csv::LineObject> const& lines);
 		/* Must be loaded after adjacencies so we know what provinces are coastal, and so can have a port */
 		bool load_province_positions(BuildingTypeManager const& building_type_manager, ast::NodeCPtr root);
-		bool load_region_file(ast::NodeCPtr root);
+		static bool load_region_colours(ast::NodeCPtr root, std::vector<colour_t>& colours);
+		bool load_region_file(ast::NodeCPtr root, std::vector<colour_t> const& colours);
 		bool load_map_images(fs::path const& province_path, fs::path const& terrain_path, bool detailed_errors);
 		bool generate_and_load_province_adjacencies(std::vector<ovdl::csv::LineObject> const& additional_adjacencies);
 		bool load_climate_file(ModifierManager const& modifier_manager, ast::NodeCPtr root);