src/roadveh_cmd.cpp
changeset 10927 5e398769e415
parent 10905 293ba816b703
child 11025 be3a48c6a25e
equal deleted inserted replaced
10926:e46c48440dbc 10927:5e398769e415
  1712 	 * a through route, do not stop) */
  1712 	 * a through route, do not stop) */
  1713 	if (IsRoadVehFront(v) && ((IsInsideMM(v->u.road.state, RVSB_IN_ROAD_STOP, RVSB_IN_ROAD_STOP_END) &&
  1713 	if (IsRoadVehFront(v) && ((IsInsideMM(v->u.road.state, RVSB_IN_ROAD_STOP, RVSB_IN_ROAD_STOP_END) &&
  1714 			_road_veh_data_1[v->u.road.state - RVSB_IN_ROAD_STOP + (_settings_game.vehicle.road_side << RVS_DRIVE_SIDE)] == v->u.road.frame) ||
  1714 			_road_veh_data_1[v->u.road.state - RVSB_IN_ROAD_STOP + (_settings_game.vehicle.road_side << RVS_DRIVE_SIDE)] == v->u.road.frame) ||
  1715 			(IsInsideMM(v->u.road.state, RVSB_IN_DT_ROAD_STOP, RVSB_IN_DT_ROAD_STOP_END) &&
  1715 			(IsInsideMM(v->u.road.state, RVSB_IN_DT_ROAD_STOP, RVSB_IN_DT_ROAD_STOP_END) &&
  1716 			v->current_order.ShouldStopAtStation(v, GetStationIndex(v->tile)) &&
  1716 			v->current_order.ShouldStopAtStation(v, GetStationIndex(v->tile)) &&
       
  1717 			v->owner == GetRoadOwner(v->tile, v->u.road.roadtype) &&
  1717 			GetRoadStopType(v->tile) == (IsCargoInClass(v->cargo_type, CC_PASSENGERS) ? ROADSTOP_BUS : ROADSTOP_TRUCK) &&
  1718 			GetRoadStopType(v->tile) == (IsCargoInClass(v->cargo_type, CC_PASSENGERS) ? ROADSTOP_BUS : ROADSTOP_TRUCK) &&
  1718 			v->u.road.frame == RVC_DRIVE_THROUGH_STOP_FRAME))) {
  1719 			v->u.road.frame == RVC_DRIVE_THROUGH_STOP_FRAME))) {
  1719 
  1720 
  1720 		RoadStop *rs = GetRoadStopByTile(v->tile, GetRoadStopType(v->tile));
  1721 		RoadStop *rs = GetRoadStopByTile(v->tile, GetRoadStopType(v->tile));
  1721 		Station* st = GetStationByTile(v->tile);
  1722 		Station* st = GetStationByTile(v->tile);