Fix guests 'waiting' on extended railway crossings

On extended railway crossings, guests would stop to 'wait' for the passing train, which would then phase right through them. This change at least allows guests a chance to get to a safe place.
This commit is contained in:
Rik Smeets 2022-10-08 21:46:58 +02:00
parent 5e080032d7
commit bba54d2ecc
3 changed files with 8 additions and 1 deletions

View File

@ -5,6 +5,7 @@
- Fix: [#18064] Unable to dismiss notification messages.
- Fix: [#18122] Ghosts count towards “Great scenery!” guest thought.
- Fix: [#18134] Underground on-ride photo section partially clips through adjacent terrain edge.
- Fix: [#18257] Guests waiting on extended railway crossings.
- Improved: [#18192, #18214] Tycoon Park has been added Extras tab, Competition scenarios have received their own section.
- Change: [#18230] Make the large flat to steep pieces available on the corkscrew roller coaster without cheats.

View File

@ -324,6 +324,12 @@ bool Peep::CheckForPath()
bool Peep::PathIsBlockedByVehicle()
{
auto curPos = TileCoordsXYZ(GetLocation());
if (FootpathIsBlockedByVehicle(curPos))
{
// If current position is blocked, try to get out of the way
return false;
}
auto dstPos = TileCoordsXYZ(CoordsXYZ{ GetDestination(), NextLoc.z });
if ((curPos.x != dstPos.x || curPos.y != dstPos.y) && FootpathIsBlockedByVehicle(dstPos))
{

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 "2"
#define NETWORK_STREAM_VERSION "3"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr;