summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-07-27 22:00:43 +0000
committerrubidium <rubidium@openttd.org>2010-07-27 22:00:43 +0000
commitcfdcb6cbee060102d3da6ea6b6a3c419f5446f0c (patch)
tree0730ba17595eaa3130e1fbbf6f85dcfd86488607
parent8df78e7a7b4fcc424e34e3fecbee85b72f1891d0 (diff)
downloadopenttd-cfdcb6cbee060102d3da6ea6b6a3c419f5446f0c.tar.xz
(svn r20230) -Fix [FS#3961]: road vehicles could be dead locked with one way roads. This allows one wayness to be removed if there are vehicles on a tile; it does not allow you to add one wayness to roads that have vehicles on them as it makes turning vehicles jump
-rw-r--r--src/road_cmd.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index 0d286cb66..96f2b0b5c 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -499,12 +499,21 @@ CommandCost CmdBuildRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
if (ret.Failed()) return ret;
}
- CommandCost ret = EnsureNoVehicleOnGround(tile);
- if (ret.Failed()) return ret;
+ DisallowedRoadDirections dis_existing = GetDisallowedRoadDirections(tile);
+ DisallowedRoadDirections dis_new = dis_existing ^ toggle_drd;
+
+ /* We allow removing disallowed directions to break up
+ * deadlocks, but adding them can break articulated
+ * vehicles. As such, only when less is disallowed,
+ * i.e. bits are removed, we skip the vehicle check. */
+ if (CountBits(dis_existing) <= CountBits(dis_new)) {
+ CommandCost ret = EnsureNoVehicleOnGround(tile);
+ if (ret.Failed()) return ret;
+ }
/* Ignore half built tiles */
if ((flags & DC_EXEC) && rt != ROADTYPE_TRAM && IsStraightRoad(existing)) {
- SetDisallowedRoadDirections(tile, GetDisallowedRoadDirections(tile) ^ toggle_drd);
+ SetDisallowedRoadDirections(tile, dis_new);
MarkTileDirtyByTile(tile);
}
return CommandCost();