dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once

Browse Source
This commit is contained in:
rubidium
2010-11-20 09:09:57 +00:00
parent eb1bf15fc4
commit d24dbdac7b
5 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/table/roadveh_movement.h
View File

@@ -1055,34 +1055,43 @@ static const RoadDriveEntry * const _road_road_drive_data[] = {
_rv_station_left_nw_far,
_rv_station_left_sw_near,
_rv_station_left_nw_near,
NULL,
NULL,
NULL,
NULL,
_rv_station_left_sw_far,
_rv_station_left_nw_far,
_rv_station_left_sw_near,
_rv_station_left_nw_near,
_rv_station_left_ne_far,
_rv_station_left_se_far,
_rv_station_left_ne_near,
_rv_station_left_se_near,
_rv_station_left_ne_far,
_rv_station_left_se_far,
_rv_station_left_ne_near,
_rv_station_left_se_near,
NULL,
NULL,
NULL,
NULL,
_rv_station_right_sw_far,
_rv_station_right_nw_far,
_rv_station_right_sw_near,
_rv_station_right_nw_near,
NULL,
NULL,
NULL,
NULL,
_rv_station_right_sw_far,
_rv_station_right_nw_far,
_rv_station_right_sw_near,
_rv_station_right_nw_near,
_rv_station_right_ne_far,
_rv_station_right_se_far,
_rv_station_right_ne_near,
_rv_station_right_se_near,
NULL,
NULL,
NULL,
NULL,
_rv_station_right_ne_far,
_rv_station_right_se_far,
_rv_station_right_ne_near,
_rv_station_right_se_near,
};
/** Table of road stop stop frames, when to stop at a road stop. */
extern const byte _road_stop_stop_frame[] = {
/* Duplicated left and right because of "entered stop" bit */
20, 20, 16, 16, 20, 20, 16, 16,
19, 19, 15, 15, 19, 19, 15, 15,
16, 16, 12, 12, 16, 16, 12, 12,
15, 15, 11, 11, 15, 15, 11, 11
};
static const RoadDriveEntry _roadveh_tram_turn_ne_0[] = {