Better province image + terrain + some buttons

1 files changed, 12 insertions, 12 deletions

diff --git a/extension/src/openvic2/Region.cpp b/extension/src/openvic2/Region.cpp
index 6ee05f5..67a75a9 100644
--- a/extension/src/openvic2/Region.cpp
+++ b/extension/src/openvic2/Region.cpp
@@ -1,26 +1,26 @@
-#include "Map.hpp"
+#include "Region.hpp"
 
 #include <cassert>
 #include <algorithm>
 
 using namespace OpenVic2;
 
-Region::Region(std::string const& new_identifier) : identifier(new_identifier) {
-	assert(!identifier.empty());
-}
-
-std::string const& Region::get_identifier() const {
-	return identifier;
-}
-
-size_t Region::get_province_count() const {
+size_t ProvinceSet::get_province_count() const {
 	return provinces.size();
 }
 
-bool Region::contains_province(Province const* province) const {
+bool ProvinceSet::contains_province(Province const* province) const {
 	return province && std::find(provinces.begin(), provinces.end(), province) != provinces.end();
 }
 
-std::vector<Province*> const& Region::get_provinces() const {
+std::set<Province*> const& ProvinceSet::get_provinces() const {
 	return provinces;
 }
+
+Region::Region(std::string const& new_identifier) : HasIdentifier(new_identifier) {}
+
+Province::colour_t Region::get_colour() const {
+	if (provinces.empty()) return 0xFF0000;
+	Province const* province = *provinces.cbegin();
+	return province->get_colour();
+}