mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
roadveh_cmd.c
View File

@ -628,7 +628,14 @@ static void ProcessRoadVehOrder(Vehicle *v)
num = GetNumRoadStops(st, type);
rs = GetPrimaryRoadStop(st, type);
assert (rs != NULL);
if (rs == NULL) {
int i, validorders = 0;
//There is no stop left at the station, so don't even TRY to go there
v->cur_order_index++;
InvalidateVehicleOrder(v);
return;
}
dist = malloc(num * sizeof(int32));
@ -1632,7 +1639,8 @@ void OnNewDay_RoadVeh(Vehicle *v)
//We do not have a slot, so make one
if (v->u.road.slot == NULL) {
//first we need to find out how far our stations are away.
assert( rs != NULL);
if ( rs == NULL )
goto no_stop;
do {
stop->dist = 0xFFFFFFFF;
@ -1688,6 +1696,7 @@ have_slot:
firststop = stop = NULL;
}
no_stop:
if (v->vehstatus & VS_STOPPED)
return;

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;