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

Merge branch 'signal_tunnels_bridges-sx' into jgrpp

Browse Source 
Conflicts:
	src/tunnelbridge.h

(Fixup zoom level changes).
This commit is contained in:
Jonathan G Rennison
2015-11-01 14:07:55 +00:00
parent bc2094d261 b96a2f7bd7
commit 169a979737
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rail_cmd.cpp
View File

@@ -1091,10 +1091,11 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1,
}
}
}
MarkTileDirtyByTile(tile);
MarkTileDirtyByTile(tile_exit);
MarkBridgeOrTunnelDirty(tile);
AddSideToSignalBuffer(tile, INVALID_DIAGDIR, GetTileOwner(tile));
AddSideToSignalBuffer(tile_exit, INVALID_DIAGDIR, GetTileOwner(tile));
YapfNotifyTrackLayoutChange(tile, track);
YapfNotifyTrackLayoutChange(tile_exit, track);
}
return cost;
}
@@ -1545,10 +1546,11 @@ CommandCost CmdRemoveSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1
ClrBitTunnelBridgeSignal(end);
_m[tile].m2 = 0;
_m[end].m2 = 0;
MarkTileDirtyByTile(tile);
MarkTileDirtyByTile(end);
MarkBridgeOrTunnelDirty(tile);
AddSideToSignalBuffer(tile, INVALID_DIAGDIR, GetTileOwner(tile));
AddSideToSignalBuffer(end, INVALID_DIAGDIR, GetTileOwner(tile));
YapfNotifyTrackLayoutChange(tile, track);
YapfNotifyTrackLayoutChange(end, track);
return CommandCost(EXPENSES_CONSTRUCTION, cost);
}