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

Don't apply peep_make_passing_peeps_sick() to peeps in a queue, fixes #1992

This commit is contained in:
Richard Jenkins 2017-03-28 08:24:42 +01:00 committed by Michael Steenbeek
parent d58f761721
commit 5b685d5cad
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/peep/peep.c
View File

@ -11185,12 +11185,14 @@ static void peep_make_passing_peeps_sick(rct_peep *peep)
sint32 zDiff = abs(otherPeep->z - peep->z);
if (zDiff <= 32) {
if (peep != otherPeep) {
if (otherPeep->action == PEEP_ACTION_NONE_1 || otherPeep->action == PEEP_ACTION_NONE_2) {
otherPeep->action = PEEP_ACTION_THROW_UP;
otherPeep->action_frame = 0;
otherPeep->action_sprite_image_offset = 0;
sub_693B58(otherPeep);
invalidate_sprite_2((rct_sprite*)otherPeep);
if (otherPeep->state != PEEP_STATE_QUEUING) {
if (otherPeep->action == PEEP_ACTION_NONE_1 || otherPeep->action == PEEP_ACTION_NONE_2) {
otherPeep->action = PEEP_ACTION_THROW_UP;
otherPeep->action_frame = 0;
otherPeep->action_sprite_image_offset = 0;
sub_693B58(otherPeep);
invalidate_sprite_2((rct_sprite*)otherPeep);
}
}
}
}