diff options
| -rw-r--r-- | roadveh_cmd.c | 13 | ||||
| -rw-r--r-- | station_cmd.c | 13 |
2 files changed, 23 insertions, 3 deletions
diff --git a/roadveh_cmd.c b/roadveh_cmd.c index 64e92d28f..53f63e013 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -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; diff --git a/station_cmd.c b/station_cmd.c index d8cc5800b..a1694a009 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -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; |