mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix crash where peeps enter through extra ride entrances (#16727)
Fix #16170, #16177
This commit is contained in:
parent
09fc49a9d7
commit
bb5d53d9f2
|
@ -3645,7 +3645,12 @@ void Guest::UpdateRideAdvanceThroughEntrance()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Guard::Assert(RideSubState == PeepRideSubState::LeaveEntrance, "Peep ridesubstate should be LeaveEntrance");
|
if (RideSubState == PeepRideSubState::InEntrance)
|
||||||
|
{
|
||||||
|
RideSubState = PeepRideSubState::FreeVehicleCheck;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_NO_VEHICLES))
|
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_NO_VEHICLES))
|
||||||
{
|
{
|
||||||
const auto& station = ride->GetStation(CurrentRideStation);
|
const auto& station = ride->GetStation(CurrentRideStation);
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
// This string specifies which version of network stream current build uses.
|
// This string specifies which version of network stream current build uses.
|
||||||
// It is used for making sure only compatible builds get connected, even within
|
// It is used for making sure only compatible builds get connected, even within
|
||||||
// single OpenRCT2 version.
|
// single OpenRCT2 version.
|
||||||
#define NETWORK_STREAM_VERSION "20"
|
#define NETWORK_STREAM_VERSION "21"
|
||||||
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
|
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
|
||||||
|
|
||||||
static Peep* _pickup_peep = nullptr;
|
static Peep* _pickup_peep = nullptr;
|
||||||
|
|
Loading…
Reference in New Issue