summaryrefslogtreecommitdiff
path: root/src/pathfinder
diff options
context:
space:
mode:
authorPatric Stout <truelight@openttd.org>2018-04-11 22:07:21 +0200
committerGitHub <noreply@github.com>2018-04-11 22:07:21 +0200
commit17bd580630fe56d48daaf017f01912064658c123 (patch)
tree7213d7622e25e3e2e75fba484b04306d82af2aaf /src/pathfinder
parent66f67ac5ac6fe3401f7b8d0eb1c75b23f0475c75 (diff)
downloadopenttd-17bd580630fe56d48daaf017f01912064658c123.tar.xz
Remove: NO_DEBUG_MESSAGES was only read and setting it broke compilation (#6703)
Given any speed issue cannot be attributed to checking for _debug_NNN_level, removing this is a safe action This fixes #6652.
Diffstat (limited to 'src/pathfinder')
-rw-r--r--src/pathfinder/npf/npf.cpp2
-rw-r--r--src/pathfinder/yapf/yapf_base.hpp4
2 files changed, 0 insertions, 6 deletions
diff --git a/src/pathfinder/npf/npf.cpp b/src/pathfinder/npf/npf.cpp
index ee60dace4..f989ff2c3 100644
--- a/src/pathfinder/npf/npf.cpp
+++ b/src/pathfinder/npf/npf.cpp
@@ -275,7 +275,6 @@ static uint NPFReservedTrackCost(AyStarNode *current)
*/
static void NPFMarkTile(TileIndex tile)
{
-#ifndef NO_DEBUG_MESSAGES
if (_debug_npf_level < 1 || _networking) return;
switch (GetTileType(tile)) {
case MP_RAILWAY:
@@ -296,7 +295,6 @@ static void NPFMarkTile(TileIndex tile)
default:
break;
}
-#endif
}
static int32 NPFWaterPathCost(AyStar *as, AyStarNode *current, OpenListNode *parent)
diff --git a/src/pathfinder/yapf/yapf_base.hpp b/src/pathfinder/yapf/yapf_base.hpp
index 713e3755a..6360567bb 100644
--- a/src/pathfinder/yapf/yapf_base.hpp
+++ b/src/pathfinder/yapf/yapf_base.hpp
@@ -122,10 +122,8 @@ public:
{
m_veh = v;
-#ifndef NO_DEBUG_MESSAGES
CPerformanceTimer perf;
perf.Start();
-#endif /* !NO_DEBUG_MESSAGES */
Yapf().PfSetStartupNodes();
bool bDestFound = true;
@@ -154,7 +152,6 @@ public:
bDestFound &= (m_pBestDestNode != NULL);
-#ifndef NO_DEBUG_MESSAGES
perf.Stop();
if (_debug_yapf_level >= 2) {
int t = perf.Get(1000000);
@@ -174,7 +171,6 @@ public:
);
}
}
-#endif /* !NO_DEBUG_MESSAGES */
return bDestFound;
}