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

Remove assert from UpdateSignalsOnSegment that globset is empty

Browse Source 
Just do the right thing if it isn't empty instead of asserting
This commit is contained in:
Jonathan G Rennison
2021-03-17 20:35:48 +00:00
parent 10f6562420
commit b9413ea250
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pbs.cpp
View File

@@ -241,9 +241,7 @@ void UnreserveRailTrack(TileIndex tile, Track t)
if (IsTunnelBridgePBS(tile)) { if (IsTunnelBridgePBS(tile)) {
SetTunnelBridgeExitSignalState(tile, SIGNAL_STATE_RED); SetTunnelBridgeExitSignalState(tile, SIGNAL_STATE_RED);
} else { } else {
UpdateSignalsInBufferIfOwnerNotAddable(GetTileOwner(tile)); UpdateSignalsOnSegment(tile, INVALID_DIAGDIR, GetTileOwner(tile));
AddSideToSignalBuffer(tile, INVALID_DIAGDIR, GetTileOwner(tile));
UpdateSignalsInBuffer();
} }
} }
MarkBridgeOrTunnelDirtyOnReservationChange(tile, VMDF_NOT_MAP_MODE); MarkBridgeOrTunnelDirtyOnReservationChange(tile, VMDF_NOT_MAP_MODE);

3
src/signal.cpp
View File

@@ -822,9 +822,10 @@ void AddSideToSignalBuffer(TileIndex tile, DiagDirection side, Owner owner)
*/ */
SigSegState UpdateSignalsOnSegment(TileIndex tile, DiagDirection side, Owner owner) SigSegState UpdateSignalsOnSegment(TileIndex tile, DiagDirection side, Owner owner)
{ {
assert(_globset.IsEmpty()); UpdateSignalsInBufferIfOwnerNotAddable(owner);
_globset.Add(tile, side); _globset.Add(tile, side);
_last_owner = INVALID_OWNER;
return UpdateSignalsInBuffer(owner); return UpdateSignalsInBuffer(owner);
} }