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

(svn r19892) -Fix [FS#3856] (r19792): crash when trying to reserve 'in depot' track on clearing a crashed train

release/1.1
rubidium 2010-05-23 22:14:22 +00:00
parent 5ba088982d
commit 4092471a98
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/train_cmd.cpp
View File

@ -3455,11 +3455,12 @@ static Vehicle *CollectTrackbitsFromCrashedVehiclesEnum(Vehicle *v, void *data)
TrackBits *trackbits = (TrackBits *)data; TrackBits *trackbits = (TrackBits *)data;
if (v->type == VEH_TRAIN && (v->vehstatus & VS_CRASHED) != 0) { if (v->type == VEH_TRAIN && (v->vehstatus & VS_CRASHED) != 0) {
if (Train::From(v)->track == TRACK_BIT_WORMHOLE) { TrackBits train_tbits = Train::From(v)->track;
if (train_tbits == TRACK_BIT_WORMHOLE) {
/* Vehicle is inside a wormhole, v->track contains no useful value then. */ /* Vehicle is inside a wormhole, v->track contains no useful value then. */
*trackbits |= DiagDirToDiagTrackBits(GetTunnelBridgeDirection(v->tile)); *trackbits |= DiagDirToDiagTrackBits(GetTunnelBridgeDirection(v->tile));
} else { } else if (train_tbits != TRACK_BIT_DEPOT) {
*trackbits |= Train::From(v)->track; *trackbits |= train_tbits;
} }
} }