markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bot: all podbot waypoints should be now located in data/pwf directory.

Browse source 
build: remove '-funroll-all-loop'.
This commit is contained in:
ds 2020-10-05 18:59:40 +03:00
commit f15a115b0a
4 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inc/product.h
View file

@ -46,7 +46,7 @@ public:
const StringRef logtag { "YB" }; const StringRef logtag { "YB" };
const StringRef dtime { __DATE__ " " __TIME__ }; const StringRef dtime { __DATE__ " " __TIME__ };
const StringRef date { __DATE__ }; 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 cmdPri { "yb" };
const StringRef cmdSec { "yapb" }; const StringRef cmdSec { "yapb" };
}; };

2
meson.build
View file

@ -149,7 +149,6 @@ if isLinux or isDarwin
if isIntel if isIntel
flagsCompiler += [ flagsCompiler += [
'-funroll-all-loops',
'-ipo', '-ipo',
'-wd11076', '-wd11076',
'-wd11074' '-wd11074'
@ -174,7 +173,6 @@ if isLinux or isDarwin
'--no-undefined' '--no-undefined'
] ]
elif isGCC and not isDarwin elif isGCC and not isDarwin
flagsCompiler += '-funroll-all-loops'
flagsLinker += '-Wl,--no-undefined' flagsLinker += '-Wl,--no-undefined'
endif endif
endif endif

2
src/engine.cpp
View file

@ -738,7 +738,7 @@ bool Game::postload () {
}); });
// ensure we're have all needed directories // 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)); File::createPath (strings.format ("%s/addons/%s/%s", getRunningModName (), product.folder, dir));
} }

6
src/graph.cpp
View file

@ -1880,12 +1880,12 @@ void BotGraph::saveOldFormat () {
const char *BotGraph::getOldFormatGraphName (bool isMemoryFile) { const char *BotGraph::getOldFormatGraphName (bool isMemoryFile) {
static String buffer; 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)) { if (File::exists (buffer)) {
return buffer.chars (); 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) { float BotGraph::calculateTravelTime (float maxSpeed, const Vector &src, const Vector &origin) {
@ -2763,7 +2763,7 @@ void BotGraph::eraseFromDisk () {
bots.kickEveryone (true); bots.kickEveryone (true);
// if we're delete graph, delete all corresponding to it files // 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.exp", data, map)); // corresponding to practice
forErase.push (strings.format ("%strain/%s.vis", data, map)); // corresponding to vistable forErase.push (strings.format ("%strain/%s.vis", data, map)); // corresponding to vistable
forErase.push (strings.format ("%strain/%s.pmx", data, map)); // corresponding to matrix forErase.push (strings.format ("%strain/%s.pmx", data, map)); // corresponding to matrix