diff options
author | rubidium <rubidium@openttd.org> | 2008-09-07 11:23:10 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2008-09-07 11:23:10 +0000 |
commit | 9474db5cb6c4b9db2f7b68d1dda1a523305282f1 (patch) | |
tree | 94706b006a8848169482c99bfbb9ca6f9c734954 /src/tunnelbridge_cmd.cpp | |
parent | f4ee4fd5aed4861fe65757d2c61ce9510c4a6216 (diff) | |
download | openttd-9474db5cb6c4b9db2f7b68d1dda1a523305282f1.tar.xz |
(svn r14258) -Codechange: rework the way to query the vehicle hash to make sure it always results in the same irregardless of the order of the hash-linked-list.
-Fix: desync in PBS reservation following, vehicle flooding and road vehicle overtake/follow code.
Diffstat (limited to 'src/tunnelbridge_cmd.cpp')
-rw-r--r-- | src/tunnelbridge_cmd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index fcf05ffb8..95bb68d7c 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -605,7 +605,7 @@ static CommandCost DoClearTunnel(TileIndex tile, uint32 flags) endtile = GetOtherTunnelEnd(tile); - if (GetVehicleTunnelBridge(tile, endtile) != NULL) return CMD_ERROR; + if (HasVehicleOnTunnelBridge(tile, endtile)) return CMD_ERROR; _build_tunnel_endtile = endtile; @@ -670,7 +670,7 @@ static CommandCost DoClearBridge(TileIndex tile, uint32 flags) endtile = GetOtherBridgeEnd(tile); - if (GetVehicleTunnelBridge(tile, endtile) != NULL) return CMD_ERROR; + if (HasVehicleOnTunnelBridge(tile, endtile)) return CMD_ERROR; direction = GetTunnelBridgeDirection(tile); delta = TileOffsByDiagDir(direction); |