mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(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

release/1.1
rubidium 2010-07-27 22:00:43 +00:00
parent 8df78e7a7b
commit cfdcb6cbee
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/road_cmd.cpp
View File

@ -499,12 +499,21 @@ CommandCost CmdBuildRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
} }
CommandCost ret = EnsureNoVehicleOnGround(tile); DisallowedRoadDirections dis_existing = GetDisallowedRoadDirections(tile);
if (ret.Failed()) return ret; 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 */ /* Ignore half built tiles */
if ((flags & DC_EXEC) && rt != ROADTYPE_TRAM && IsStraightRoad(existing)) { if ((flags & DC_EXEC) && rt != ROADTYPE_TRAM && IsStraightRoad(existing)) {
SetDisallowedRoadDirections(tile, GetDisallowedRoadDirections(tile) ^ toggle_drd); SetDisallowedRoadDirections(tile, dis_new);
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
} }
return CommandCost(); return CommandCost();