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

(svn r5037) -Fix: assert when GetVehicleTrackdir() returns wrong trackdir - introduced by r5033 (thanks yanek)

release/0.5
KUDr 2006-05-30 15:04:59 +00:00
parent a6f7d7c57b
commit 078399d314
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
yapf/yapf_road.cpp
View File

@ -301,10 +301,7 @@ public:
return 0; return 0;
} }
// set origin (tile, trackdir) if (!SetOriginFromVehiclePos(v)) return UINT_MAX;
TileIndex src_tile = v->tile;
Trackdir src_td = GetVehicleTrackdir(v);
Yapf().SetOrigin(src_tile, TrackdirToTrackdirBits(src_td));
// set destination tile, trackdir // set destination tile, trackdir
// get available trackdirs on the destination tile // get available trackdirs on the destination tile
@ -327,6 +324,21 @@ public:
return dist; return dist;
} }
/** Return true if the valid origin (tile/trackdir) was set from the current vehicle position. */
FORCEINLINE bool SetOriginFromVehiclePos(const Vehicle *v)
{
// set origin (tile, trackdir)
TileIndex src_tile = v->tile;
Trackdir src_td = GetVehicleTrackdir(v);
if ((GetTileTrackStatus(src_tile, TRANSPORT_ROAD) & TrackdirToTrackdirBits(src_td)) == 0) {
// sometimes the roadveh is not on the road (it resides on non-existing track)
// how should we handle that situation?
return false;
}
Yapf().SetOrigin(src_tile, TrackdirToTrackdirBits(src_td));
return true;
}
static Depot* stFindNearestDepot(Vehicle* v, TileIndex tile, Trackdir td) static Depot* stFindNearestDepot(Vehicle* v, TileIndex tile, Trackdir td)
{ {
Tpf pf; Tpf pf;