summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2008-09-13 17:37:18 +0000
committersmatz <smatz@openttd.org>2008-09-13 17:37:18 +0000
commit54d1b499813d8c6f1bab48e1dd00dc624d095558 (patch)
tree3f8ce47a27166da6b19ddb3d75e2647949437620 /src
parentc4d49dfc2115ff1c857c7f676a4bdacdfcf94ffa (diff)
downloadopenttd-54d1b499813d8c6f1bab48e1dd00dc624d095558.tar.xz
(svn r14316) -Fix: do not allow building road over level crossings and drive-through road stops in the wrong direction even when the roadtype is present
Diffstat (limited to 'src')
-rw-r--r--src/road_cmd.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index 6d1d878c6..417c35010 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -523,10 +523,11 @@ CommandCost CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
} break;
case ROAD_TILE_CROSSING:
- if (HasTileRoadType(tile, rt)) return_cmd_error(STR_1007_ALREADY_BUILT);
other_bits = GetCrossingRoadBits(tile);
if (pieces & ComplementRoadBits(other_bits)) goto do_clear;
pieces = other_bits; // we need to pay for both roadbits
+
+ if (HasTileRoadType(tile, rt)) return_cmd_error(STR_1007_ALREADY_BUILT);
break;
default:
@@ -578,11 +579,12 @@ CommandCost CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
case MP_STATION: {
if (!IsDriveThroughStopTile(tile)) goto do_clear;
- if (HasTileRoadType(tile, rt)) return_cmd_error(STR_1007_ALREADY_BUILT);
RoadBits curbits = AxisToRoadBits(DiagDirToAxis(GetRoadStopDir(tile)));
if (pieces & ~curbits) goto do_clear;
pieces = curbits; // we need to pay for both roadbits
+
+ if (HasTileRoadType(tile, rt)) return_cmd_error(STR_1007_ALREADY_BUILT);
} break;
case MP_TUNNELBRIDGE: