|
@@ -13,7 +13,7 @@
|
|
|
#include "timetable.h"
|
|
|
#include "engine.h"
|
|
|
#include "command_func.h"
|
|
|
#include "station.h"
|
|
|
#include "station_base.h"
|
|
|
#include "news_func.h"
|
|
|
#include "pathfind.h"
|
|
|
#include "npf.h"
|
|
@@ -1171,7 +1171,7 @@ static Trackdir RoadFindPathToDest(Vehic
|
|
|
trackdirs = TRACKDIR_BIT_NONE;
|
|
|
} else {
|
|
|
/* Our station */
|
|
|
RoadStop::Type rstype = IsCargoInClass(v->cargo_type, CC_PASSENGERS) ? RoadStop::BUS : RoadStop::TRUCK;
|
|
|
RoadStopType rstype = IsCargoInClass(v->cargo_type, CC_PASSENGERS) ? ROADSTOP_BUS : ROADSTOP_TRUCK;
|
|
|
|
|
|
if (GetRoadStopType(tile) != rstype) {
|
|
|
/* Wrong station type */
|
|
@@ -1807,7 +1807,7 @@ again:
|
|
|
_road_veh_data_1[v->u.road.state - RVSB_IN_ROAD_STOP + (_opt.road_side << RVS_DRIVE_SIDE)] == v->u.road.frame) ||
|
|
|
(IsInsideMM(v->u.road.state, RVSB_IN_DT_ROAD_STOP, RVSB_IN_DT_ROAD_STOP_END) &&
|
|
|
v->current_order.dest == GetStationIndex(v->tile) &&
|
|
|
GetRoadStopType(v->tile) == (IsCargoInClass(v->cargo_type, CC_PASSENGERS) ? RoadStop::BUS : RoadStop::TRUCK) &&
|
|
|
GetRoadStopType(v->tile) == (IsCargoInClass(v->cargo_type, CC_PASSENGERS) ? ROADSTOP_BUS : ROADSTOP_TRUCK) &&
|
|
|
v->u.road.frame == RVC_DRIVE_THROUGH_STOP_FRAME))) {
|
|
|
|
|
|
RoadStop *rs = GetRoadStopByTile(v->tile, GetRoadStopType(v->tile));
|
|
@@ -1822,7 +1822,7 @@ again:
|
|
|
|
|
|
if (IsDriveThroughStopTile(v->tile)) {
|
|
|
TileIndex next_tile = TILE_ADD(v->tile, TileOffsByDir(v->direction));
|
|
|
RoadStop::Type type = IsCargoInClass(v->cargo_type, CC_PASSENGERS) ? RoadStop::BUS : RoadStop::TRUCK;
|
|
|
RoadStopType type = IsCargoInClass(v->cargo_type, CC_PASSENGERS) ? ROADSTOP_BUS : ROADSTOP_TRUCK;
|
|
|
|
|
|
/* Check if next inline bay is free */
|
|
|
if (IsDriveThroughStopTile(next_tile) && (GetRoadStopType(next_tile) == type)) {
|