mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add needed calls to the new function

This commit is contained in:
Daniel Trujillo 2016-07-09 00:17:48 +02:00
parent ed73a9dfe0
commit 013266c6ae
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ride/vehicle.c
View File

@ -5401,25 +5401,28 @@ static void sub_6DAB4C_chunk_2(rct_vehicle *vehicle)
} }
int trackType = vehicle->track_type >> 2; int trackType = vehicle->track_type >> 2;
switch (trackType) { switch (trackType) {
case TRACK_ELEM_END_STATION: case TRACK_ELEM_END_STATION:
case TRACK_ELEM_BLOCK_BRAKES: case TRACK_ELEM_BLOCK_BRAKES:
if (ride->mode == RIDE_MODE_CONTINUOUS_CIRCUIT || ride_is_block_sectioned(ride)) { if (ride->mode == RIDE_MODE_CONTINUOUS_CIRCUIT || ride_is_block_sectioned(ride))
break; apply_block_section_stop_site(vehicle, ride);
}
return; break;
case TRACK_ELEM_25_DEG_UP_TO_FLAT: case TRACK_ELEM_25_DEG_UP_TO_FLAT:
case TRACK_ELEM_60_DEG_UP_TO_FLAT: case TRACK_ELEM_60_DEG_UP_TO_FLAT:
case TRACK_ELEM_CABLE_LIFT_HILL: case TRACK_ELEM_CABLE_LIFT_HILL:
case TRACK_ELEM_DIAG_25_DEG_UP_TO_FLAT: case TRACK_ELEM_DIAG_25_DEG_UP_TO_FLAT:
case TRACK_ELEM_DIAG_60_DEG_UP_TO_FLAT: case TRACK_ELEM_DIAG_60_DEG_UP_TO_FLAT:
if (ride_is_block_sectioned(ride)) { if (ride_is_block_sectioned(ride))
break; apply_block_section_stop_site(vehicle, ride);
}
return; break;
default:
return;
} }
}
void apply_block_section_stop_site(rct_vehicle *vehicle, rct_ride *ride){
int trackType = vehicle->track_type >> 2;
rct_map_element *trackElement = map_get_track_element_at_of_type( rct_map_element *trackElement = map_get_track_element_at_of_type(
vehicle->track_x, vehicle->track_x,
@ -5428,11 +5431,6 @@ static void sub_6DAB4C_chunk_2(rct_vehicle *vehicle)
trackType trackType
); );
}
void apply_block_section_stop_site(rct_vehicle *vehicle, rct_map_element *trackElement){
int trackType = vehicle->track_type >> 2;
if (trackType == TRACK_ELEM_END_STATION) { if (trackType == TRACK_ELEM_END_STATION) {
if (trackElement->flags & MAP_ELEMENT_FLAG_BLOCK_BREAK_CLOSED) { if (trackElement->flags & MAP_ELEMENT_FLAG_BLOCK_BREAK_CLOSED) {
RCT2_GLOBAL(0x00F64E18, uint32) |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_10; RCT2_GLOBAL(0x00F64E18, uint32) |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_10;