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

Resolved leaving guests searching for invalid entrance

This commit is contained in:
LRFLEW 2016-01-05 00:03:30 -07:00
parent e94b7d5338
commit 63ddfa53cd
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -11,6 +11,7 @@
- Fix: [#2449] Turning off Day/Night Circle while it is night doesn't reset back to day
- Fix: [#2650] Server did not validate actions send from clients (caused error box and desynchronisation)
- Fix: [#2651] Ride was not removed when multiplayer client aborted ride construction.
- Fix: [#2654] Free transport rides can prevent guests from properly leaving the park
0.0.3.1-beta (2015-12-04)
------------------------------------------------------------------------

9
src/peep/peep.c
View File

@ -7279,6 +7279,12 @@ static int guest_path_find_leaving_park(rct_peep *peep, rct_map_element *map_ele
*/
static int guest_path_find_park_entrance(rct_peep* peep, rct_map_element *map_element, uint8 edges){
uint8 entranceNum;
// Resolves already-corrupt guests (e.g. loaded from save)
if (peep->flags & PEEP_FLAGS_PARK_ENTRANCE_CHOSEN &&
(peep->current_ride >= 4 ||
RCT2_ADDRESS(RCT2_ADDRESS_PARK_ENTRANCE_X, sint16)[peep->current_ride] == (sint16)0x8000)
) peep->flags &= ~(PEEP_FLAGS_PARK_ENTRANCE_CHOSEN);
if (!(peep->flags & PEEP_FLAGS_PARK_ENTRANCE_CHOSEN)){
uint8 chosenEntrance = 0xFF;
@ -8065,6 +8071,9 @@ static void peep_on_exit_ride(rct_peep *peep, int rideIndex)
peep->happiness = peep->happiness_growth_rate;
peep->nausea = peep->nausea_growth_rate;
peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_STATS;
if (peep->flags & PEEP_FLAGS_LEAVING_PARK)
peep->flags &= ~(PEEP_FLAGS_PARK_ENTRANCE_CHOSEN);
if (peep_should_go_on_ride_again(peep, ride)) {
peep->guest_heading_to_ride_id = rideIndex;