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

Remove to do statement by explicit null check on collideVehicle

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

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

@ -6638,14 +6638,13 @@ bool Vehicle::UpdateMotionCollisionDetection(const CoordsXYZ& loc, EntityId* oth
}
}
if (!mayCollide)
if (!mayCollide || collideVehicle == nullptr)
{
CollisionDetectionTimer = 0;
return false;
}
if (collideVehicle->status == Vehicle::Status::TravellingBoat
&& sub_state == BoatHireSubState::EnteringReturnPosition)
if (collideVehicle->status == Vehicle::Status::TravellingBoat && sub_state == BoatHireSubState::EnteringReturnPosition)
{
return false;
}
@ -6659,8 +6658,6 @@ bool Vehicle::UpdateMotionCollisionDetection(const CoordsXYZ& loc, EntityId* oth
return true;
}
// TODO Is it possible for collideVehicle to be NULL?
if (status == Vehicle::Status::MovingToEndOfStation)
{
if (Orientation == 0)