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

Fix for missing exit

This commit is contained in:
Michał Janiszewski 2016-01-04 23:28:11 +01:00
parent 286f89b941
commit e63f43c337
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/peep/peep.c
View File

@ -1645,7 +1645,7 @@ static void peep_go_to_ride_entrance(rct_peep* peep, rct_ride* ride){
rct_map_element* map_element = ride_get_station_exit_element(ride, x, y, z);
uint8 direction = !map_element ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK;
uint8 direction = (map_element == NULL ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
x *= 32;
y *= 32;
@ -1896,7 +1896,7 @@ void peep_update_ride_sub_state_1(rct_peep* peep){
rct_map_element* map_element = ride_get_station_exit_element(ride, x, y, z);
uint8 direction_entrance = (map_element->type & MAP_ELEMENT_DIRECTION_MASK);
uint8 direction_entrance = (map_element == NULL ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
if (ride->type == RIDE_TYPE_MAZE){
peep->maze_last_edge = direction_entrance + 1;
@ -1934,7 +1934,7 @@ void peep_update_ride_sub_state_1(rct_peep* peep){
map_element = ride_get_station_start_track_element(ride, peep->current_ride_station);
uint8 direction_track = (!map_element ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
uint8 direction_track = (map_element == NULL ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
peep->var_37 = (direction_entrance << 2) | (direction_track << 4);
@ -1972,14 +1972,14 @@ void peep_update_ride_sub_state_1(rct_peep* peep){
rct_map_element* map_element = ride_get_station_exit_element(ride, x, y, z);
uint8 direction_entrance = !map_element ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK;
uint8 direction_entrance = (map_element == NULL ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
x = ride->station_starts[peep->current_ride_station] & 0xFF;
y = ride->station_starts[peep->current_ride_station] >> 8;
map_element = ride_get_station_start_track_element(ride, peep->current_ride_station);
uint8 direction_track = (!map_element ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
uint8 direction_track = (map_element == NULL ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]);
ride_entry = GET_RIDE_ENTRY(vehicle->ride_subtype);
@ -2161,7 +2161,7 @@ static void peep_update_ride_sub_state_2_rejoin_queue(rct_peep* peep, rct_ride*
rct_map_element* map_element = ride_get_station_exit_element(ride, x, y, z);
uint8 direction_entrance = !map_element ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK;
uint8 direction_entrance = (map_element == NULL ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
x *= 32;
y *= 32;
@ -2386,7 +2386,7 @@ void peep_update_ride_sub_state_7(rct_peep* peep){
rct_map_element* map_element = ride_get_station_exit_element(ride, x, y, z);
uint8 exit_direction = map_element->type & MAP_ELEMENT_DIRECTION_MASK;
uint8 exit_direction = (map_element == NULL ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
exit_direction ^= (1 << 1);
if (!(RCT2_ADDRESS(RCT2_ADDRESS_RIDE_FLAGS, uint32)[ride->type * 2] & RIDE_TYPE_FLAG_16)){
@ -2470,14 +2470,14 @@ void peep_update_ride_sub_state_7(rct_peep* peep){
rct_map_element* map_element = ride_get_station_exit_element(ride, x, y, z);
uint8 exit_direction = map_element->type & MAP_ELEMENT_DIRECTION_MASK;
uint8 exit_direction = (map_element == NULL ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
x = ride->station_starts[peep->current_ride_station] & 0xFF;
y = ride->station_starts[peep->current_ride_station] >> 8;
map_element = ride_get_station_start_track_element(ride, peep->current_ride_station);
uint8 station_direction = (!map_element ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
uint8 station_direction = (map_element == NULL ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]);
@ -2545,7 +2545,7 @@ static void peep_update_ride_prepare_for_state_9(rct_peep* peep){
rct_map_element* map_element = ride_get_station_exit_element(ride, x, y, z);
uint8 exit_direction = map_element->type & MAP_ELEMENT_DIRECTION_MASK;
uint8 exit_direction = (map_element == NULL ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
x *= 32;
y *= 32;
@ -2760,7 +2760,7 @@ static void peep_update_ride_sub_state_13(rct_peep* peep){
rct_map_element* map_element = ride_get_station_exit_element(ride, x, y, z);
uint8 exit_direction = map_element->type & MAP_ELEMENT_DIRECTION_MASK;
uint8 exit_direction = (map_element == NULL ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
exit_direction ^= (1 << 1);
x *= 32;
@ -2830,7 +2830,7 @@ static void peep_update_ride_sub_state_14(rct_peep* peep){
rct_map_element* map_element = ride_get_station_exit_element(ride, x, y, z);
uint8 exit_direction = map_element->type & MAP_ELEMENT_DIRECTION_MASK;
uint8 exit_direction = (map_element == NULL ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
peep->var_37 = (exit_direction * 4) | (peep->var_37 & 0x30) | 1;
x = ride->station_starts[peep->current_ride_station] & 0xFF;
@ -2998,7 +2998,7 @@ static void peep_update_ride_sub_state_16(rct_peep* peep){
rct_map_element* map_element = ride_get_station_exit_element(ride, x, y, z);
uint8 exit_direction = map_element->type & MAP_ELEMENT_DIRECTION_MASK;
uint8 exit_direction = (map_element == NULL ? 0 : map_element->type & MAP_ELEMENT_DIRECTION_MASK);
exit_direction ^= (1 << 1);
x *= 32;

2
src/ride/ride.c
View File

@ -995,7 +995,7 @@ void ride_remove_peeps(int rideIndex)
exitZ = ride->station_heights[stationIndex];
mapElement = ride_get_station_exit_element(ride, exitX, exitY, exitZ);
exitDirection = mapElement->type & 3;
exitDirection = (mapElement == NULL ? 0 : mapElement->type & MAP_ELEMENT_DIRECTION_MASK);
exitX = (exitX * 32) - (RCT2_ADDRESS(0x00981D6C, sint16)[exitDirection * 2] * 20) + 16;
exitY = (exitY * 32) - (RCT2_ADDRESS(0x00981D6E, sint16)[exitDirection * 2] * 20) + 16;
exitZ = (exitZ * 8) + 2;