summaryrefslogtreecommitdiff
path: root/src/yapf/follow_track.hpp
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2008-04-17 00:44:20 +0000
committersmatz <smatz@openttd.org>2008-04-17 00:44:20 +0000
commit9488db56d4994cb653129e7d82973ae827537e05 (patch)
tree5f5827bd541cf5d637cd23faa64aea957404ca89 /src/yapf/follow_track.hpp
parent1367c9016149f3e750bf5cb2b0f7cbe0dbfaee1b (diff)
downloadopenttd-9488db56d4994cb653129e7d82973ae827537e05.tar.xz
(svn r12745) -Codechange: a bit of naming conventions, introduce Is*DepotTile()
Diffstat (limited to 'src/yapf/follow_track.hpp')
-rw-r--r--src/yapf/follow_track.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/yapf/follow_track.hpp b/src/yapf/follow_track.hpp
index afde47dd7..0b5608fb4 100644
--- a/src/yapf/follow_track.hpp
+++ b/src/yapf/follow_track.hpp
@@ -196,7 +196,7 @@ protected:
}
// road depots can be also left in one direction only
- if (IsRoadTT() && IsTileDepotType(m_old_tile, TT())) {
+ if (IsRoadTT() && IsDepotTypeTile(m_old_tile, TT())) {
DiagDirection exitdir = GetRoadDepotDirection(m_old_tile);
if (exitdir != m_exitdir) {
m_err = EC_NO_WAY;
@@ -226,7 +226,7 @@ protected:
}
// road and rail depots can also be entered from one direction only
- if (IsRoadTT() && IsTileDepotType(m_new_tile, TT())) {
+ if (IsRoadTT() && IsDepotTypeTile(m_new_tile, TT())) {
DiagDirection exitdir = GetRoadDepotDirection(m_new_tile);
if (ReverseDiagDir(exitdir) != m_exitdir) {
m_err = EC_NO_WAY;
@@ -238,7 +238,7 @@ protected:
return false;
}
}
- if (IsRailTT() && IsTileDepotType(m_new_tile, TT())) {
+ if (IsRailTT() && IsDepotTypeTile(m_new_tile, TT())) {
DiagDirection exitdir = GetRailDepotDirection(m_new_tile);
if (ReverseDiagDir(exitdir) != m_exitdir) {
m_err = EC_NO_WAY;
@@ -305,7 +305,7 @@ protected:
FORCEINLINE bool ForcedReverse()
{
// rail and road depots cause reversing
- if (!IsWaterTT() && IsTileDepotType(m_old_tile, TT())) {
+ if (!IsWaterTT() && IsDepotTypeTile(m_old_tile, TT())) {
DiagDirection exitdir = IsRailTT() ? GetRailDepotDirection(m_old_tile) : GetRoadDepotDirection(m_old_tile);
if (exitdir != m_exitdir) {
// reverse