????

CMakeLists.txt

@@ -80,7 +80,7 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
 IF(NOT WIN32)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable")

include/mapgen/Biom.hpp

@@ -23,7 +23,8 @@ const float DEFAULT_HUMIDITY = 0.f;
   const Biom DEEP = {-1.0000, sf::Color(39, 39, 70), "Deep", 0};
   const Biom SHALLOW = {-0.2500, sf::Color(51, 51, 91), "Shallow", 0};
   const Biom SHORE = {0.0000, sf::Color(68, 99, 130), "Shore", 0};
-  const Biom SAND = {0.0625, sf::Color(255,255,255), "Sand", 0};
+  // const Biom SAND = {0.0625, sf::Color(255,255,255), "Sand", 0};
+  const Biom SAND = {0.0625, sf::Color(210, 185, 139), "Sand", 0};
   const Biom GRASS = {0.1250, sf::Color(136, 170, 85), "Grass", 0.8};
   const Biom FORREST = {0.3750, sf::Color(51, 119, 85), "Forrest", 0.6};
   const Biom ROCK = {0.7500, sf::Color(148, 148, 148), "Rock", 0};

include/mapgen/City.hpp

@@ -12,7 +12,7 @@ class City : public Location {
   City(Region* r, std::string n, LocationType t);
   Package* makeGoods(int y);
   int buyGoods(std::vector<Package*>* goods);
-  EconomyVars* economyVars;
+  EconomyVars* economyVars = nullptr;
 
   bool isCapital = false;
 

include/mapgen/MapGenerator.hpp

@@ -39,7 +39,7 @@ class MapGenerator {
   int getRelax();
   float getFrequency();
   int getSeed();
-  Region *getRegion(sf::Vector2f pos);
+  Region *getRegion(Region* r, sf::Vector2f pos);
   std::vector<sf::ConvexShape> *getPolygons();
   void seed();
   std::vector<Region *> getRegions();

include/mapgen/Painter.hpp

@@ -1 +1,9 @@
+#include "mapgen/Region.hpp"
+#include <SFML/Graphics.hpp>
 
+struct DrawableRegion {
+public:
+  sf::ConvexShape shape ;
+  Region* region;
+  int zIndex;
+};

include/mapgen/Region.hpp

@@ -42,6 +42,7 @@ class Region {
   State* state = nullptr;
   bool stateBorder = false;
   bool seaBorder = false;
+  bool isCoast();
 private:
 	PointList _verticies;
   HeightMap _heights;

src/City.cpp

@@ -21,9 +21,7 @@ Package *City::makeGoods(int y) {
   case MINE:
     p = region->minerals * economyVars->PACKAGES_PER_MINERALS * population *
         economyVars->PACKAGES_MINERALS_POPULATION_MODIFIER;
-    for (int n = 0; n < p; n++) {
-      goods = new Package(this, MINERALS, p);
-    }
+    goods = new Package(this, MINERALS, p);
     break;
   }
   return goods;

src/MapGenerator.cpp

@@ -1104,12 +1104,11 @@ void MapGenerator::makeClusters() {
   }
 }
 
-Region *MapGenerator::getRegion(sf::Vector2f pos) {
-  for (auto &pair : _cells) {
-    Cell *c = pair.first;
-    if (c->pointIntersection(pos.x, pos.y) != -1) {
-      return pair.second;
-    }
+Region *MapGenerator::getRegion(Region* startRegion, sf::Vector2f pos) {
+  for (auto region : map->regions) {
+      if (region->cell->pointIntersection(pos.x, pos.y) != -1) {
+        return region;
+      }
   }
   return nullptr;
 }