cosmetic

CMakeLists.txt

@@ -7,7 +7,8 @@ endif()
 
 project(mapgen)
 set (mapgen_VERSION_MAJOR 0)
-set (mapgen_VERSION_MINOR 1)
+set (mapgen_VERSION_MINOR 4)
+set (mapgen_VERSION_PATCH 1)
 
 file(GLOB SOURCE "src/*.cpp" "include/mapgen/*.h")
 file(COPY "font.ttf" DESTINATION "bin")

MapgenConfig.h

@@ -1,2 +1,3 @@
 #define Mapgen_VERSION_MAJOR 
 #define Mapgen_VERSION_MINOR 
+#define Mapgen_VERSION_PATCH 

MapgenConfig.h.in

@@ -1,2 +1,3 @@
 #define Mapgen_VERSION_MAJOR @Mapgen_VERSION_MAJOR@
 #define Mapgen_VERSION_MINOR @Mapgen_VERSION_MINOR@
+#define Mapgen_VERSION_PATCH @Mapgen_VERSION_PATCH@

src/Map.cpp

@@ -1,26 +1,26 @@
 #ifndef MAP_CPP_
 #define MAP_CPP_
-#include "micropather.h"
-#include "mapgen/Region.hpp"
-#include "mapgen/River.hpp"
 #include "mapgen/City.hpp"
 #include "mapgen/Location.hpp"
+#include "mapgen/Region.hpp"
+#include "mapgen/River.hpp"
 #include "mapgen/Road.hpp"
+#include "micropather.h"
 
-class Map: public micropather::Graph {
+class Map : public micropather::Graph {
 public:
   ~Map(){};
 
-  std::vector<MegaCluster*> megaClusters;
-  std::vector<Cluster*> clusters;
+  std::vector<MegaCluster *> megaClusters;
+  std::vector<Cluster *> clusters;
 
-  std::vector<Region*> regions;
-  std::vector<River*> rivers;
-  std::vector<City*> cities;
-  std::vector<Location*> locations;
-  std::vector<Road*> roads;
+  std::vector<Region *> regions;
+  std::vector<River *> rivers;
+  std::vector<City *> cities;
+  std::vector<Location *> locations;
+  std::vector<Road *> roads;
 
-  float getRegionDistance(Region* r, Region* r2) {
+  float getRegionDistance(Region *r, Region *r2) {
     Point p = r->site;
     Point p2 = r2->site;
     double distancex = (p2->x - p->x);
@@ -35,22 +35,24 @@ class Map: public micropather::Graph {
           d -= 5000;
         }
       }
+      if (r->hasRiver) {
+        d *= 0.6;
+      }
     } else {
       d *= 0.8;
     }
     return d;
   }
 
-
-  float LeastCostEstimate( void* stateStart, void* stateEnd ){
-    return getRegionDistance((Region*)stateStart, (Region*)stateEnd);
+  float LeastCostEstimate(void *stateStart, void *stateEnd) {
+    return getRegionDistance((Region *)stateStart, (Region *)stateEnd);
   };
 
-  void AdjacentCost( void* state, MP_VECTOR< micropather::StateCost > *neighbors ){
-    auto r = ((Region*)state);
+  void AdjacentCost(void *state, MP_VECTOR<micropather::StateCost> *neighbors) {
+    auto r = ((Region *)state);
     for (auto n : r->neighbors) {
 
-      if(n->biom.name == "Lake"){
+      if (n->biom.name == "Lake") {
         continue;
       }
       if (r->megaCluster->isLand) {
@@ -67,11 +69,12 @@ class Map: public micropather::Graph {
         }
       }
 
-      micropather::StateCost nodeCost = { (void*)n, getRegionDistance((Region*)state, (Region*)n) };
-      neighbors->push_back( nodeCost );
+      micropather::StateCost nodeCost = {
+          (void *)n, getRegionDistance((Region *)state, (Region *)n)};
+      neighbors->push_back(nodeCost);
     }
   };
-  void PrintStateInfo( void* state ){};
+  void PrintStateInfo(void *state){};
 };
 
 #endif

src/application.cpp

@@ -17,6 +17,7 @@
 #include "objectsWindow.cpp"
 
 class Application {
+  std::string VERSION;
   std::vector<sf::ConvexShape> polygons;
   std::vector<sf::CircleShape> poi;
   std::vector<sf::ConvexShape> infoPolygons;
@@ -59,7 +60,7 @@ class Application {
   bool lock = false;
 
 public:
-  Application() {
+  Application(std::string v) : VERSION(v) {
     sf::ContextSettings settings;
     settings.antialiasingLevel = 8;
 
@@ -137,6 +138,8 @@ class Application {
     if (generator.joinable())
       generator.join();
     generator = std::thread([&]() {
+      lockedRegion = nullptr;
+      lock = false;
       ready = false;
       mapgen->update();
       seed = mapgen->getSeed();
@@ -387,7 +390,7 @@ class Application {
       return;
     }
 
-    if (currentRegion->location != nullptr) {
+    if (currentRegion->location != nullptr && !roads) {
       for (auto r : mapgen->map->roads) {
         if (r->regions[0] != currentRegion->location->region &&
             r->regions.back() != currentRegion->location->region) {
@@ -612,10 +615,12 @@ class Application {
       drawMap();
 
       sf::Vector2u windowSize = window->getSize();
-      sf::Text mark("Mapgen by Averrin", sffont);
+      char mt[40];
+      sprintf(mt, "Mapgen [%s] by Averrin", VERSION.c_str());
+      sf::Text mark(mt, sffont);
       mark.setCharacterSize(15);
       mark.setColor(sf::Color::White);
-      mark.setPosition(sf::Vector2f(windowSize.x - 160, windowSize.y - 25));
+      mark.setPosition(sf::Vector2f(windowSize.x - 240, windowSize.y - 25));
       window->draw(mark);
 
       if (showUI) {

src/main.cpp

@@ -1,7 +1,9 @@
 #include "application.cpp"
 
+std::string VERSION = "0.4.1";
+
 int main()
 {
-  Application app;
+  Application app(VERSION);
   app.serve();
 }