From f15a115b0a0a9a463cf45df41f89d6f0cd92a45e Mon Sep 17 00:00:00 2001
From: ds <ds@stx.su>
Date: Mon, 5 Oct 2020 18:59:40 +0300
Subject: [PATCH] bot: all podbot waypoints should be now located in data/pwf
 directory. build: remove '-funroll-all-loop'.

---
 inc/product.h  | 2 +-
 meson.build    | 2 --
 src/engine.cpp | 2 +-
 src/graph.cpp  | 6 +++---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/inc/product.h b/inc/product.h
index 8347e3e..7c2f9da 100644
--- a/inc/product.h
+++ b/inc/product.h
@@ -46,7 +46,7 @@ public:
    const StringRef logtag { "YB" };
    const StringRef dtime { __DATE__ " " __TIME__ };
    const StringRef date { __DATE__ };
-   const StringRef version { MODULE_BOT_VERSION };
+   const StringRef version { MODULE_BOT_VERSION "." MODULE_BUILD_COUNT };
    const StringRef cmdPri { "yb" };
    const StringRef cmdSec { "yapb" };
 };
diff --git a/meson.build b/meson.build
index fc5f65b..a829263 100644
--- a/meson.build
+++ b/meson.build
@@ -149,7 +149,6 @@ if isLinux or isDarwin
         
         if isIntel 
             flagsCompiler += [
-                '-funroll-all-loops',
                 '-ipo',
                 '-wd11076', 
                 '-wd11074'
@@ -174,7 +173,6 @@ if isLinux or isDarwin
                 '--no-undefined'
             ]
         elif isGCC and not isDarwin
-            flagsCompiler += '-funroll-all-loops'
             flagsLinker += '-Wl,--no-undefined'
         endif
     endif
diff --git a/src/engine.cpp b/src/engine.cpp
index ed01297..0f1472b 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -738,7 +738,7 @@ bool Game::postload () {
    });
 
    // ensure we're have all needed directories
-   for (const auto &dir : StringArray { "conf/lang", "data/train", "data/graph", "data/logs" }) {
+   for (const auto &dir : StringArray { "conf/lang", "data/train", "data/graph", "data/logs", "data/pwf" }) {
       File::createPath (strings.format ("%s/addons/%s/%s", getRunningModName (), product.folder, dir));
    }
 
diff --git a/src/graph.cpp b/src/graph.cpp
index 7afcca7..5768182 100644
--- a/src/graph.cpp
+++ b/src/graph.cpp
@@ -1880,12 +1880,12 @@ void BotGraph::saveOldFormat () {
 
 const char *BotGraph::getOldFormatGraphName (bool isMemoryFile) {
    static String buffer;
-   buffer.assignf ("%s%s.pwf", getDataDirectory (isMemoryFile), game.getMapName ());
+   buffer.assignf ("%s/pwf/%s.pwf", getDataDirectory (isMemoryFile), game.getMapName ());
 
    if (File::exists (buffer)) {
       return buffer.chars ();
    }
-   return strings.format ("%s%s.pwf", getDataDirectory (isMemoryFile), game.getMapName ());
+   return strings.format ("%s/pwf/%s.pwf", getDataDirectory (isMemoryFile), game.getMapName ());
 }
 
 float BotGraph::calculateTravelTime (float maxSpeed, const Vector &src, const Vector &origin) {
@@ -2763,7 +2763,7 @@ void BotGraph::eraseFromDisk () {
    bots.kickEveryone (true);
 
    // if we're delete graph, delete all corresponding to it files
-   forErase.push (strings.format ("%s%s.pwf", data, map)); // graph itself
+   forErase.push (strings.format ("%spwf/%s.pwf", data, map)); // graph itself
    forErase.push (strings.format ("%strain/%s.exp", data, map)); // corresponding to practice
    forErase.push (strings.format ("%strain/%s.vis", data, map)); // corresponding to vistable
    forErase.push (strings.format ("%strain/%s.pmx", data, map)); // corresponding to matrix