summaryrefslogtreecommitdiff
path: root/src/yapf
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-07-29 23:42:59 +0000
committerrubidium <rubidium@openttd.org>2007-07-29 23:42:59 +0000
commit2800a49f0361b586573e8d3c78a1ecb13e414b18 (patch)
tree35f2cfc46313d08457c127c393370517d519fab3 /src/yapf
parenta15df67f9a3d78f1b55b9fdd7b780b26f2cf60d3 (diff)
downloadopenttd-2800a49f0361b586573e8d3c78a1ecb13e414b18.tar.xz
(svn r10733) -Codechange: change MP_STREET into MP_ROAD as we use the word "road" everywhere except in the tile type.
Diffstat (limited to 'src/yapf')
-rw-r--r--src/yapf/yapf_costrail.hpp2
-rw-r--r--src/yapf/yapf_road.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/yapf/yapf_costrail.hpp b/src/yapf/yapf_costrail.hpp
index 8ecd4e94a..3b57fe328 100644
--- a/src/yapf/yapf_costrail.hpp
+++ b/src/yapf/yapf_costrail.hpp
@@ -112,7 +112,7 @@ public:
if (IsDiagonalTrackdir(trackdir)) {
cost += YAPF_TILE_LENGTH;
switch (GetTileType(tile)) {
- case MP_STREET:
+ case MP_ROAD:
/* Increase the cost for level crossings */
if (IsLevelCrossing(tile))
cost += Yapf().PfGetSettings().rail_crossing_penalty;
diff --git a/src/yapf/yapf_road.cpp b/src/yapf/yapf_road.cpp
index d048bbbe9..99bde7fdb 100644
--- a/src/yapf/yapf_road.cpp
+++ b/src/yapf/yapf_road.cpp
@@ -48,7 +48,7 @@ protected:
if (IsDiagonalTrackdir(trackdir)) {
cost += YAPF_TILE_LENGTH;
switch (GetTileType(tile)) {
- case MP_STREET:
+ case MP_ROAD:
/* Increase the cost for level crossings */
if (IsLevelCrossing(tile))
cost += Yapf().PfGetSettings().road_crossing_penalty;
@@ -442,7 +442,7 @@ Depot* YapfFindNearestRoadDepot(const Vehicle *v)
return NULL;
// handle the case when our vehicle is already in the depot tile
- if (IsTileType(tile, MP_STREET) && IsTileDepotType(tile, TRANSPORT_ROAD)) {
+ if (IsTileType(tile, MP_ROAD) && IsTileDepotType(tile, TRANSPORT_ROAD)) {
// only what we need to return is the Depot*
return GetDepotByTile(tile);
}