Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r11861) -Fix: do not call rail specific functions when removing road tunnel/bridge

Browse Source
This commit is contained in:
smatz 2008-01-15 11:45:29 +00:00
parent ea6535c864
commit 0078fd1699
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/tunnelbridge_cmd.cpp
View File

@ -606,15 +606,19 @@ static CommandCost DoClearTunnel(TileIndex tile, uint32 flags)
/* We first need to request the direction before calling DoClearSquare /* We first need to request the direction before calling DoClearSquare
* else the direction is always 0.. dah!! ;) */ * else the direction is always 0.. dah!! ;) */
DiagDirection dir = GetTunnelBridgeDirection(tile); DiagDirection dir = GetTunnelBridgeDirection(tile);
Track track; bool rail = GetTunnelBridgeTransportType(tile) == TRANSPORT_RAIL;
DoClearSquare(tile); DoClearSquare(tile);
DoClearSquare(endtile); DoClearSquare(endtile);
UpdateSignalsOnSegment(tile, ReverseDiagDir(dir));
UpdateSignalsOnSegment(endtile, dir); if (rail) {
track = AxisToTrack(DiagDirToAxis(dir)); UpdateSignalsOnSegment(tile, ReverseDiagDir(dir));
YapfNotifyTrackLayoutChange(tile, track); UpdateSignalsOnSegment(endtile, dir);
YapfNotifyTrackLayoutChange(endtile, track);
Track track = AxisToTrack(DiagDirToAxis(dir));
YapfNotifyTrackLayoutChange(tile, track);
YapfNotifyTrackLayoutChange(endtile, track);
}
} }
return CommandCost(EXPENSES_CONSTRUCTION, _price.clear_tunnel * (DistanceManhattan(tile, endtile) + 1)); return CommandCost(EXPENSES_CONSTRUCTION, _price.clear_tunnel * (DistanceManhattan(tile, endtile) + 1));
} }
@ -654,21 +658,24 @@ static CommandCost DoClearBridge(TileIndex tile, uint32 flags)
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
TileIndex c; /* read this value before actual removal of bridge */
Track track; bool rail = GetTunnelBridgeTransportType(tile) == TRANSPORT_RAIL;
DoClearSquare(tile); DoClearSquare(tile);
DoClearSquare(endtile); DoClearSquare(endtile);
for (c = tile + delta; c != endtile; c += delta) { for (TileIndex c = tile + delta; c != endtile; c += delta) {
ClearBridgeMiddle(c); ClearBridgeMiddle(c);
MarkTileDirtyByTile(c); MarkTileDirtyByTile(c);
} }
UpdateSignalsOnSegment(tile, ReverseDiagDir(direction)); if (rail) {
UpdateSignalsOnSegment(endtile, direction); UpdateSignalsOnSegment(tile, ReverseDiagDir(direction));
track = AxisToTrack(DiagDirToAxis(direction)); UpdateSignalsOnSegment(endtile, direction);
YapfNotifyTrackLayoutChange(tile, track);
YapfNotifyTrackLayoutChange(endtile, track); Track track = AxisToTrack(DiagDirToAxis(direction));
YapfNotifyTrackLayoutChange(tile, track);
YapfNotifyTrackLayoutChange(endtile, track);
}
} }
return CommandCost(EXPENSES_CONSTRUCTION, (DistanceManhattan(tile, endtile) + 1) * _price.clear_bridge); return CommandCost(EXPENSES_CONSTRUCTION, (DistanceManhattan(tile, endtile) + 1) * _price.clear_bridge);