dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix removing signals from bridges not updating adjacent signals.

Browse Source 
Fix minor whitespace/code issues.
This commit is contained in:
Jonathan G Rennison
2015-10-31 01:30:08 +00:00
parent 20f1f48983
commit 654afdc113
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rail_cmd.cpp
View File

@@ -1038,7 +1038,7 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1,
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
if (p2 == 0 && HasWormholeSignals(tile)) { // Toggle signal if already signals present. if (p2 == 0 && HasWormholeSignals(tile)) { // Toggle signal if already signals present.
if (IsTunnelBridgeEntrance (tile)) { if (IsTunnelBridgeEntrance(tile)) {
ClrBitTunnelBridgeSignal(tile); ClrBitTunnelBridgeSignal(tile);
ClrBitTunnelBridgeExit(tile_exit); ClrBitTunnelBridgeExit(tile_exit);
SetBitTunnelBridgeExit(tile); SetBitTunnelBridgeExit(tile);
@@ -1049,7 +1049,7 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1,
SetBitTunnelBridgeExit(tile_exit); SetBitTunnelBridgeExit(tile_exit);
SetBitTunnelBridgeSignal(tile); SetBitTunnelBridgeSignal(tile);
} }
} else{ } else {
/* Create one direction tunnel/bridge if required. */ /* Create one direction tunnel/bridge if required. */
if (p2 == 0) { if (p2 == 0) {
SetBitTunnelBridgeSignal(tile); SetBitTunnelBridgeSignal(tile);
@@ -1069,7 +1069,7 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1,
} }
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
MarkTileDirtyByTile(tile_exit); MarkTileDirtyByTile(tile_exit);
AddSideToSignalBuffer(tile, INVALID_DIAGDIR, _current_company); AddSideToSignalBuffer(tile, INVALID_DIAGDIR, GetTileOwner(tile));
YapfNotifyTrackLayoutChange(tile, track); YapfNotifyTrackLayoutChange(tile, track);
} }
return cost; return cost;
@@ -1517,6 +1517,8 @@ CommandCost CmdRemoveSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1
_m[end].m2 = 0; _m[end].m2 = 0;
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
MarkTileDirtyByTile(end); MarkTileDirtyByTile(end);
AddSideToSignalBuffer(tile, INVALID_DIAGDIR, GetTileOwner(tile));
YapfNotifyTrackLayoutChange(tile, track);
return CommandCost(EXPENSES_CONSTRUCTION, cost); return CommandCost(EXPENSES_CONSTRUCTION, cost);
} }