summaryrefslogtreecommitdiff
path: root/src/npf.cpp
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/npf.cpp
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/npf.cpp')
-rw-r--r--src/npf.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/npf.cpp b/src/npf.cpp
index 5f7fce75c..57b5dad04 100644
--- a/src/npf.cpp
+++ b/src/npf.cpp
@@ -232,7 +232,7 @@ static void NPFMarkTile(TileIndex tile)
}
break;
- case MP_STREET:
+ case MP_ROAD:
if (!IsTileDepotType(tile, TRANSPORT_ROAD)) {
SetRoadside(tile, ROADSIDE_BARREN);
MarkTileDirtyByTile(tile);
@@ -276,7 +276,7 @@ static int32 NPFRoadPathCost(AyStar* as, AyStarNode* current, OpenListNode* pare
cost = IsTunnel(tile) ? NPFTunnelCost(current) : NPFBridgeCost(current);
break;
- case MP_STREET:
+ case MP_ROAD:
cost = NPF_TILE_LENGTH;
/* Increase the cost for level crossings */
if (IsLevelCrossing(tile)) cost += _patches.npf_crossing_penalty;
@@ -327,7 +327,7 @@ static int32 NPFRailPathCost(AyStar* as, AyStarNode* current, OpenListNode* pare
cost = _trackdir_length[trackdir]; /* Should be different for diagonal tracks */
break;
- case MP_STREET: /* Railway crossing */
+ case MP_ROAD: /* Railway crossing */
cost = NPF_TILE_LENGTH;
break;
@@ -468,7 +468,7 @@ static bool VehicleMayEnterTile(Owner owner, TileIndex tile, DiagDirection enter
}
switch (GetTileType(tile)) {
- case MP_STREET:
+ case MP_ROAD:
/* rail-road crossing : are we looking at the railway part? */
if (IsLevelCrossing(tile) &&
DiagDirToAxis(enterdir) != GetCrossingRoadAxis(tile)) {