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

Fix #866: Boat Hire boats get stuck entering track

This commit is contained in:
Rik Smeets 2024-04-07 20:17:55 +02:00
parent 2a78399418
commit e250ec3b66
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -1,5 +1,6 @@
0.4.11 (in development)
------------------------------------------------------------------------
- Fix: [#866] Boat Hire boats get stuck entering track.
0.4.10 (2024-04-02)
------------------------------------------------------------------------

2
src/openrct2/network/NetworkBase.cpp
View File

@ -46,7 +46,7 @@ using namespace OpenRCT2;
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "0"
#define NETWORK_STREAM_VERSION "1"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION

6
src/openrct2/ride/Vehicle.cpp
View File

@ -6644,6 +6644,12 @@ bool Vehicle::UpdateMotionCollisionDetection(const CoordsXYZ& loc, EntityId* oth
return false;
}
if (collideVehicle->status == Vehicle::Status::TravellingBoat
&& sub_state == BoatHireSubState::EnteringReturnPosition)
{
return false;
}
CollisionDetectionTimer++;
if (CollisionDetectionTimer < 200)
{