From fac2f8ce1ad9b527bbfdd1b80b727282a1e84e73 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 4 Dec 2009 20:52:19 +0000 Subject: (svn r18404) -Codechange: link drive through stops better together -Feature: make penalty for road stop occupancy user configurable -Fix [FS#1944]: road vehicles would not pick an empty drive through stop. Now they will *if* the penalty for driving around is less than the occupancy penalty -Fix [FS#1495]: long (articulated) road vehicles could block loading of others when the following road vehicle already got 'permission' to go to the next bay even when it could not reach it -Change: improve the throughput of the drive through road stops by letting them stop closer together --- src/settings_type.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/settings_type.h') diff --git a/src/settings_type.h b/src/settings_type.h index 7bfc38ae3..fcbf40fbb 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -223,6 +223,8 @@ struct NPFSettings { uint32 npf_road_curve_penalty; ///< the penalty for curves uint32 npf_crossing_penalty; ///< the penalty for level crossings uint32 npf_road_drive_through_penalty; ///< the penalty for going through a drive-through road stop + uint32 npf_road_dt_occupied_penalty; ///< the penalty multiplied by the fill percentage of a drive-through road stop + uint32 npf_road_bay_occupied_penalty; ///< the penalty multiplied by the fill percentage of a road bay }; /** Settings related to the yet another pathfinder. */ @@ -236,6 +238,8 @@ struct YAPFSettings { uint32 road_curve_penalty; ///< penalty for curves uint32 road_crossing_penalty; ///< penalty for level crossing uint32 road_stop_penalty; ///< penalty for going through a drive-through road stop + uint32 road_stop_occupied_penalty; ///< penalty multiplied by the fill percentage of a drive-through road stop + uint32 road_stop_bay_occupied_penalty; ///< penalty multiplied by the fill percentage of a road bay bool rail_firstred_twoway_eol; ///< treat first red two-way signal as dead end uint32 rail_firstred_penalty; ///< penalty for first red signal uint32 rail_firstred_exit_penalty; ///< penalty for first red exit signal -- cgit v1.2.3-54-g00ecf