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

(svn r1735) -Fix: [ 1112285 ] Fixed an assertion error with stations where stops

Browse Source 
were deleted, the assertions were just plain wrong at that place. Used a
more graceful handling. Todo: What happens if ALL stations in a schedule
have no suitable stop?
This commit is contained in:
celestar
2005-01-30 17:46:57 +00:00
parent 1527ef3db0
commit 6d1ee15b9a
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
station_cmd.c
View File

@@ -166,7 +166,18 @@ TileIndex GetStationTileForVehicle(const Vehicle *v, const Station *st)
case VEH_Train: return st->train_tile;
case VEH_Aircraft: return st->airport_tile;
case VEH_Ship: return st->dock_tile;
case VEH_Road: return (v->cargo_type == CT_PASSENGERS) ? st->bus_stops->xy : st->truck_stops->xy;
case VEH_Road:
if (v->cargo_type == CT_PASSENGERS) {
if (st->bus_stops != NULL)
return st->bus_stops->xy;
else
return 0;
} else {
if (st->truck_stops != NULL)
return st->truck_stops->xy;
else
return 0;
}
default:
assert(false);
return 0;