mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-25 15:54:31 +01:00
Code Issues Releases Wiki Activity

Code style: Remove snakes from everything world apart from Map.h (#18273)

Browse Source 
* Remove remaining snakes from world (outside of map)

* Initial few desnaking of Map.h
This commit is contained in:
Duncan
2022-10-11 19:39:24 +01:00
committed by GitHub
parent 0c78a27d9f
commit 67bbc8560d
90 changed files with 404 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -898,7 +898,7 @@ OpenRCT2::Audio::VehicleSoundParams Vehicle::CreateSoundParam(uint16_t priority)
if (x != LOCATION_NULL)
{
auto surfaceElement = map_get_surface_element_at(CoordsXY{ x, y });
auto surfaceElement = MapGetSurfaceElementAt(CoordsXY{ x, y });
// vehicle underground
if (surfaceElement != nullptr && surfaceElement->GetBaseZ() > z)
@@ -1737,13 +1737,13 @@ void Vehicle::UpdateMeasurements()
return;
}
auto surfaceElement = map_get_surface_element_at(CoordsXY{ x, y });
auto surfaceElement = MapGetSurfaceElementAt(CoordsXY{ x, y });
// If vehicle above ground.
if (surfaceElement != nullptr && surfaceElement->GetBaseZ() <= z)
{
// Set tile_element to first element. Since elements aren't always ordered by base height,
// we must start at the first element and iterate through each tile element.
auto tileElement = map_get_first_element_at(CoordsXY{ x, y });
auto tileElement = MapGetFirstElementAt(CoordsXY{ x, y });
if (tileElement == nullptr)
return;
@@ -4615,7 +4615,7 @@ void Vehicle::UpdateBoatLocation()
*/
static bool vehicle_boat_is_location_accessible(const CoordsXYZ& location)
{
TileElement* tileElement = map_get_first_element_at(location);
TileElement* tileElement = MapGetFirstElementAt(location);
if (tileElement == nullptr)
return false;
do
@@ -5121,7 +5121,7 @@ void Vehicle::UpdateDoingCircusShow()
*/
static TileElement* vehicle_check_collision(const CoordsXYZ& vehiclePosition)
{
TileElement* tileElement = map_get_first_element_at(vehiclePosition);
TileElement* tileElement = MapGetFirstElementAt(vehiclePosition);
if (tileElement == nullptr)
{
return nullptr;