mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r4016) -Backport from trunk (3998): When removing rail track from a tile where only X and Y pieces exist, explicitly update signals in both directions.

release/0.4.5
celestar 2006-03-22 11:23:22 +00:00
parent ca0a0cdbfd
commit 31d6286cb4
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rail_cmd.c
View File

@ -395,6 +395,7 @@ int32 CmdRemoveSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2)
TileIndex tile; TileIndex tile;
byte m5; byte m5;
int32 cost = _price.remove_rail; int32 cost = _price.remove_rail;
bool crossing = false;
if (!ValParamTrackOrientation(p2)) return CMD_ERROR; if (!ValParamTrackOrientation(p2)) return CMD_ERROR;
trackbit = TrackToTrackBits(track); trackbit = TrackToTrackBits(track);
@ -453,7 +454,9 @@ int32 CmdRemoveSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2)
SetTileOwner(tile, _m[tile].m3); SetTileOwner(tile, _m[tile].m3);
break; break;
case MP_RAILWAY: case MP_RAILWAY: {
TrackBits present;
if (!IsPlainRailTile(tile)) if (!IsPlainRailTile(tile))
return CMD_ERROR; return CMD_ERROR;
@ -461,6 +464,10 @@ int32 CmdRemoveSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (!(GetTrackBits(tile) & trackbit)) if (!(GetTrackBits(tile) & trackbit))
return CMD_ERROR; return CMD_ERROR;
present = GetTrackBits(tile);
if ((present & trackbit) == 0) return CMD_ERROR;
if (present == (TRACK_BIT_DIAG1 | TRACK_BIT_DIAG2)) crossing = true;
/* Charge extra to remove signals on the track, if they are there */ /* Charge extra to remove signals on the track, if they are there */
if (HasSignalOnTrack(tile, track)) if (HasSignalOnTrack(tile, track))
cost += DoCommand(x, y, track, 0, flags, CMD_REMOVE_SIGNALS); cost += DoCommand(x, y, track, 0, flags, CMD_REMOVE_SIGNALS);
@ -478,13 +485,26 @@ int32 CmdRemoveSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2)
goto skip_mark_dirty; goto skip_mark_dirty;
} }
break; break;
}
default: default:
assert(0); assert(0);
} }
/* mark_dirty */ /* mark_dirty */
MarkTileDirtyByTile(tile); if (flags & DC_EXEC) {
MarkTileDirtyByTile(tile);
if (crossing) {
/* crossing is set when only TRACK_BIT_X and TRACK_BIT_Y are set. As we
* are removing one of these pieces, we'll need to update signals for
* both directions explicitly, as after the track is removed it won't
* 'connect' with the other piece. */
SetSignalsOnBothDir(tile, TRACK_DIAG1);
SetSignalsOnBothDir(tile, TRACK_DIAG2);
} else {
SetSignalsOnBothDir(tile, track);
}
}
skip_mark_dirty:; skip_mark_dirty:;