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

Part of #12165: Use CoordsXYZ on vehicle_check_collision 

Updated vehicle_check_collision function prototype to use CoordsXYZ. Updated caller(s) accordingly.
This commit is contained in:
Helio Santos 2020-07-09 08:02:45 -07:00
parent 69221606ef
commit a524b2d5ba
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5130,34 +5130,34 @@ void Vehicle::UpdateDoingCircusShow()
* rct2: 0x0068B8BD
* @returns the map element that the vehicle will collide with or NULL if no collisions.
*/
static TileElement* vehicle_check_collision(int16_t x, int16_t y, int16_t z)
static TileElement* vehicle_check_collision(const CoordsXYZ& vehiclePosition)
{
TileElement* tileElement = map_get_first_element_at({ x, y });
TileElement* tileElement = map_get_first_element_at(vehiclePosition);
if (tileElement == nullptr)
{
return nullptr;
}
uint8_t quadrant;
if ((x & 0x1F) >= 16)
if ((vehiclePosition.x & 0x1F) >= 16)
{
quadrant = 1;
if ((y & 0x1F) < 16)
if ((vehiclePosition.y & 0x1F) < 16)
quadrant = 2;
}
else
{
quadrant = 4;
if ((y & 0x1F) >= 16)
if ((vehiclePosition.y & 0x1F) >= 16)
quadrant = 8;
}
do
{
if (z < tileElement->GetBaseZ())
if (vehiclePosition.z < tileElement->GetBaseZ())
continue;
if (z >= tileElement->GetClearanceZ())
if (vehiclePosition.z >= tileElement->GetClearanceZ())
continue;
if (tileElement->GetOccupiedQuadrants() & quadrant)
@ -5398,7 +5398,7 @@ void Vehicle::UpdateCrash()
continue;
}
TileElement* collideElement = vehicle_check_collision(curVehicle->x, curVehicle->y, curVehicle->z);
TileElement* collideElement = vehicle_check_collision({ curVehicle->x, curVehicle->y, curVehicle->z });
if (collideElement == nullptr)
{
curVehicle->sub_state = 1;