From 79e2b3153d4d89a653a72e07727e58300b435ac4 Mon Sep 17 00:00:00 2001 From: terkhen Date: Tue, 14 Dec 2010 21:26:03 +0000 Subject: (svn r21516) -Codechange: Add IsGroundVehicle function to the Vehicle class. --- src/pathfinder/npf/npf.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pathfinder/npf/npf.cpp') diff --git a/src/pathfinder/npf/npf.cpp b/src/pathfinder/npf/npf.cpp index 45c1c2d9c..e8e13f5fd 100644 --- a/src/pathfinder/npf/npf.cpp +++ b/src/pathfinder/npf/npf.cpp @@ -1101,7 +1101,7 @@ static void NPFFillWithOrderData(NPFFindStationOrTileData *fstd, const Vehicle * * So only for train orders to stations we fill fstd->station_index, for all * others only dest_coords */ if (v->type != VEH_SHIP && (v->current_order.IsType(OT_GOTO_STATION) || v->current_order.IsType(OT_GOTO_WAYPOINT))) { - assert(v->type == VEH_TRAIN || v->type == VEH_ROAD); + assert(v->IsGroundVehicle()); fstd->station_index = v->current_order.GetDestination(); fstd->station_type = (v->type == VEH_TRAIN) ? (v->current_order.IsType(OT_GOTO_STATION) ? STATION_RAIL : STATION_WAYPOINT) : (RoadVehicle::From(v)->IsBus() ? STATION_BUS : STATION_TRUCK); fstd->not_articulated = v->type == VEH_ROAD && !RoadVehicle::From(v)->HasArticulatedPart(); -- cgit v1.2.3-54-g00ecf