diff options
author | frosch <frosch@openttd.org> | 2009-12-02 17:37:02 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2009-12-02 17:37:02 +0000 |
commit | 59f9163e37a7da7e8ef1cf52de8aa5e349ead5c1 (patch) | |
tree | 2119cf742c992f2df8b00ca09365f722679628d9 /src/station_cmd.cpp | |
parent | 2265202d7764d861fd3f85d10fd550cf39ba2037 (diff) | |
download | openttd-59f9163e37a7da7e8ef1cf52de8aa5e349ead5c1.tar.xz |
(svn r18381) -Codechange: Add RoadVehicle::IsBus() to simplify some stuff.
Diffstat (limited to 'src/station_cmd.cpp')
-rw-r--r-- | src/station_cmd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 8346a61ba..2fd46ca82 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2699,7 +2699,7 @@ static VehicleEnterTileStatus VehicleEnter_Station(Vehicle *v, TileIndex tile, i if (!rs->IsFreeBay(side)) return VETSB_CANNOT_ENTER; /* Check if the vehicle is stopping at this road stop */ - if (GetRoadStopType(tile) == (IsCargoInClass(rv->cargo_type, CC_PASSENGERS) ? ROADSTOP_BUS : ROADSTOP_TRUCK) && + if (GetRoadStopType(tile) == (rv->IsBus() ? ROADSTOP_BUS : ROADSTOP_TRUCK) && rv->current_order.GetDestination() == GetStationIndex(tile)) { SetBit(rv->state, RVS_IS_STOPPING); rs->AllocateDriveThroughBay(side); |