Fix guests leaving queue if other guest rejoins it (#17788)

If another guest returns to the queue from the entrance building, guests arriving at the entrance building through the queue could decide to leave it.
This commit is contained in:
Rik Smeets 2022-08-29 20:57:51 +02:00 committed by GitHub
parent 6c54bacd41
commit e0648f8ddb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 7 deletions

View File

@ -41,6 +41,7 @@
- Fix: [#17703] (undefined string) when building on invalid height.
- Fix: [#17776] “Other Parks” tab uses separate lists for SC4/SC6 and .park scenarios.
- Fix: [#17784] Colour preset RNG is biased (original bug).
- Fix: [#17788] Guests could leave queue if another guest rejoins it from the entrance building.
- Fix: [#17834] Finance window becomes blank after 4096 years.
- Fix: [#17905] The chain button in the map window is enabled for rectangular maps when (re)opened.

View File

@ -5497,14 +5497,8 @@ void Guest::UpdateQueuing()
DestinationTolerance = 0;
SetState(PeepState::QueuingFront);
RideSubState = PeepRideSubState::AtEntrance;
return;
}
// Give up queueing for the ride
sprite_direction ^= (1 << 4);
Invalidate();
RemoveFromQueue();
SetState(PeepState::One);
return;
}

View File

@ -42,7 +42,7 @@
// This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "10"
#define NETWORK_STREAM_VERSION "11"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr;