petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r13974) -Fix [YAPP]: A train crash could lead to stale reservations. (michi_cc)

Browse Source
This commit is contained in:
frosch
2008-08-03 14:16:57 +00:00
parent 9a1958be91
commit 983e297ff0
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/pbs.cpp
View File

@@ -204,13 +204,24 @@ static PBSTileInfo FollowReservation(Owner o, RailTypes rts, TileIndex tile, Tra
return PBSTileInfo(tile, trackdir, false);
}
/** Callback for VehicleFromPos to find a train on a specific track. */
static Vehicle *FindTrainOnTrackEnum(Vehicle *v, void *data)
{
PBSTileInfo info = *(PBSTileInfo *)data;
if (v->type == VEH_TRAIN && !(v->vehstatus & VS_CRASHED) && HasBit((TrackBits)v->u.rail.track, TrackdirToTrack(info.trackdir))) return v;
return NULL;
}
/**
* Follow a train reservation to the last tile.
*
* @param v the vehicle
* @param train_on_res Is set to a train we might encounter
* @returns The last tile of the reservation or the current train tile if no reservation present.
*/
PBSTileInfo FollowTrainReservation(const Vehicle *v)
PBSTileInfo FollowTrainReservation(const Vehicle *v, Vehicle **train_on_res)
{
assert(v->type == VEH_TRAIN);
@@ -221,19 +232,10 @@ PBSTileInfo FollowTrainReservation(const Vehicle *v)
PBSTileInfo res = FollowReservation(v->owner, GetRailTypeInfo(v->u.rail.railtype)->compatible_railtypes, tile, trackdir);
res.okay = IsSafeWaitingPosition(v, res.tile, res.trackdir, true, _settings_game.pf.forbid_90_deg);
if (train_on_res != NULL) *train_on_res = VehicleFromPos(res.tile, &res, FindTrainOnTrackEnum);
return res;
}
/** Callback for VehicleFromPos to find a train on a specific track. */
static Vehicle *FindTrainOnTrackEnum(Vehicle *v, void *data)
{
PBSTileInfo info = *(PBSTileInfo *)data;
if (v->type == VEH_TRAIN && !(v->vehstatus & VS_CRASHED) && HasBit((TrackBits)v->u.rail.track, TrackdirToTrack(info.trackdir))) return v;
return NULL;
}
/**
* Find the train which has reserved a specific path.
*