diff options
| author | rubidium <rubidium@openttd.org> | 2009-07-02 08:59:27 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-07-02 08:59:27 +0000 |
| commit | 61e735ba4c62e578ca16f708ac1fdc872ff6416d (patch) | |
| tree | 5deab079f0b88a32b90e1d0ed7f44a140ace2560 /src/station_cmd.cpp | |
| parent | 77eaefb61c9d1cbd4e6347e3fc042565a5b7572e (diff) | |
| download | openttd-61e735ba4c62e578ca16f708ac1fdc872ff6416d.tar.xz | |
(svn r16721) -Codechange: make Is/SetRoadVehicleFront, Is/Set/HasArticulatedPart member of RoadVehicle.
Diffstat (limited to 'src/station_cmd.cpp')
| -rw-r--r-- | src/station_cmd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 51e714f4d..dc7cdb4c5 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2542,7 +2542,7 @@ static VehicleEnterTileStatus VehicleEnter_Station(Vehicle *v, TileIndex tile, i } else if (v->type == VEH_ROAD) { RoadVehicle *rv = RoadVehicle::From(v); if (rv->state < RVSB_IN_ROAD_STOP && !IsReversingRoadTrackdir((Trackdir)rv->state) && rv->frame == 0) { - if (IsRoadStop(tile) && IsRoadVehFront(v)) { + if (IsRoadStop(tile) && rv->IsRoadVehFront()) { /* Attempt to allocate a parking bay in a road stop */ RoadStop *rs = RoadStop::GetByTile(tile, GetRoadStopType(tile)); @@ -2570,7 +2570,7 @@ static VehicleEnterTileStatus VehicleEnter_Station(Vehicle *v, TileIndex tile, i /* For normal (non drive-through) road stops * Check if station is busy or if there are no free bays or whether it is a articulated vehicle. */ - if (rs->IsEntranceBusy() || !rs->HasFreeBay() || RoadVehHasArticPart(v)) return VETSB_CANNOT_ENTER; + if (rs->IsEntranceBusy() || !rs->HasFreeBay() || rv->RoadVehHasArticPart()) return VETSB_CANNOT_ENTER; SetBit(rv->state, RVS_IN_ROAD_STOP); |