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

(svn r2625) - Fix: [pbs] Store the end of a train's reserved path explicitly. Prevents trains from unreserving eachothers paths in some cases.

Browse Source 
- CodeChange: Use the TrackdirToTrack function instead of &7, and remove an unneeded variable.
This commit is contained in:
hackykid
2005-07-17 20:09:02 +00:00
parent 09195e0bda
commit 552aa1b4dc
6 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pbs.c
View File

@@ -189,13 +189,17 @@ void PBSClearTrack(TileIndex tile, Track track) {
MarkTileDirtyByTile(tile);
};
void PBSClearPath(TileIndex tile, Trackdir trackdir) {
void PBSClearPath(TileIndex tile, Trackdir trackdir, TileIndex end_tile, Trackdir end_trackdir) {
uint16 res;
FindLengthOfTunnelResult flotr;
assert(IsValidTile(tile));
assert((trackdir & ~8) <= 5);
assert(IsValidTrackdir(trackdir));
do {
PBSClearTrack(tile, trackdir & 7);
PBSClearTrack(tile, TrackdirToTrack(trackdir));
if (tile == end_tile && TrackdirToTrack(trackdir) == TrackdirToTrack(end_trackdir))
return;
if (IsTileType(tile, MP_TUNNELBRIDGE) && (_m[tile].m5 & 0xF0)==0 && (unsigned)(_m[tile].m5 & 3) == TrackdirToExitdir(trackdir)) {
// this is a tunnel
@@ -204,11 +208,7 @@ void PBSClearPath(TileIndex tile, Trackdir trackdir) {
tile = flotr.tile;
} else {
byte exitdir = TrackdirToExitdir(trackdir);
if (IsTileDepotType(tile, TRANSPORT_RAIL) && (exitdir != GetDepotDirection(tile, TRANSPORT_RAIL)))
return;
tile = AddTileIndexDiffCWrap(tile, TileIndexDiffCByDir(exitdir));
if (IsTileDepotType(tile, TRANSPORT_RAIL) && (exitdir != ReverseDiagdir(GetDepotDirection(tile, TRANSPORT_RAIL))))
return;
};
res = PBSTileReserved(tile);