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

Fix crash where peeps enter through extra ride entrances (#16727) 

Fix #16170, #16177
This commit is contained in:
Charles Machalow 2022-03-14 23:39:13 -07:00 committed by GitHub
parent 09fc49a9d7
commit bb5d53d9f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/entity/Guest.cpp
View File

@ -3645,7 +3645,12 @@ void Guest::UpdateRideAdvanceThroughEntrance()
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))
{
const auto& station = ride->GetStation(CurrentRideStation);

2
src/openrct2/network/NetworkBase.cpp
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 "20"
#define NETWORK_STREAM_VERSION "21"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr;