Merge pull request #350 into jgrpp

This commit is contained in:
Jonathan G Rennison
2022-01-01 02:05:09 +00:00

View File

@@ -2141,6 +2141,8 @@ CommandCost CmdRemoveSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1
Track end_track = FindFirstTrack(GetAcrossTunnelBridgeTrackBits(end)); Track end_track = FindFirstTrack(GetAcrossTunnelBridgeTrackBits(end));
Company *c = Company::Get(GetTileOwner(tile)); Company *c = Company::Get(GetTileOwner(tile));
c->infrastructure.signal -= GetTunnelBridgeSignalSimulationSignalCount(tile, end); c->infrastructure.signal -= GetTunnelBridgeSignalSimulationSignalCount(tile, end);
TraceRestrictNotifySignalRemoval(tile, track);
TraceRestrictNotifySignalRemoval(end, end_track);
ClearBridgeTunnelSignalSimulation(end, tile); ClearBridgeTunnelSignalSimulation(end, tile);
ClearBridgeTunnelSignalSimulation(tile, end); ClearBridgeTunnelSignalSimulation(tile, end);
MarkBridgeOrTunnelDirty(tile); MarkBridgeOrTunnelDirty(tile);
@@ -2148,8 +2150,6 @@ CommandCost CmdRemoveSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1
AddSideToSignalBuffer(end, INVALID_DIAGDIR, GetTileOwner(tile)); AddSideToSignalBuffer(end, INVALID_DIAGDIR, GetTileOwner(tile));
YapfNotifyTrackLayoutChange(tile, track); YapfNotifyTrackLayoutChange(tile, track);
YapfNotifyTrackLayoutChange(end, end_track); YapfNotifyTrackLayoutChange(end, end_track);
TraceRestrictNotifySignalRemoval(tile, track);
TraceRestrictNotifySignalRemoval(end, end_track);
DirtyCompanyInfrastructureWindows(GetTileOwner(tile)); DirtyCompanyInfrastructureWindows(GetTileOwner(tile));
for (Train *v : re_reserve_trains) { for (Train *v : re_reserve_trains) {
ReReserveTrainPath(v); ReReserveTrainPath(v);