diff options
| author | rubidium <rubidium@openttd.org> | 2008-04-13 16:54:19 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-04-13 16:54:19 +0000 |
| commit | a277d2df86c687b39d53af921df3442d790a9976 (patch) | |
| tree | c86cfde879096a6a1bcd92d313e174e9a965cc68 /src/station_cmd.cpp | |
| parent | 79f4d763edcda79f13e95cf9f86b9e2782003194 (diff) | |
| download | openttd-a277d2df86c687b39d53af921df3442d790a9976.tar.xz | |
(svn r12689) -Feature: non-stop(or rather no non-stop) and via orders for road vehicles.
Diffstat (limited to 'src/station_cmd.cpp')
| -rw-r--r-- | src/station_cmd.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index de8bc268f..f0d20b05b 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2406,9 +2406,9 @@ static const byte _enter_station_speedtable[12] = { static VehicleEnterTileStatus VehicleEnter_Station(Vehicle *v, TileIndex tile, int x, int y) { StationID station_id = GetStationIndex(tile); - if (!v->current_order.ShouldStopAtStation(v, station_id)) return VETSB_CONTINUE; if (v->type == VEH_TRAIN) { + if (!v->current_order.ShouldStopAtStation(v, station_id)) return VETSB_CONTINUE; if (IsRailwayStation(tile) && IsFrontEngine(v) && !IsCompatibleTrainStationTile(tile + TileOffsByDiagDir(DirToDiagDir(v->direction)), tile)) { DiagDirection dir = DirToDiagDir(v->direction); @@ -2436,6 +2436,8 @@ static VehicleEnterTileStatus VehicleEnter_Station(Vehicle *v, TileIndex tile, i RoadStop *rs = GetRoadStopByTile(tile, GetRoadStopType(tile)); if (IsDriveThroughStopTile(tile)) { + if (!v->current_order.ShouldStopAtStation(v, station_id)) return VETSB_CONTINUE; + /* Vehicles entering a drive-through stop from the 'normal' side use first bay (bay 0). */ byte side = ((DirToDiagDir(v->direction) == ReverseDiagDir(GetRoadStopDir(tile))) == (v->u.road.overtaking == 0)) ? 0 : 1; |