mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 07:14: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

32
src/openrct2/world/Footpath.cpp
View File

@@ -118,7 +118,7 @@ static bool entrance_has_direction(const EntranceElement& entranceElement, int32
TileElement* MapGetFootpathElement(const CoordsXYZ& coords)
{
TileElement* tileElement = map_get_first_element_at(coords);
TileElement* tileElement = MapGetFirstElementAt(coords);
do
{
if (tileElement == nullptr)
@@ -440,7 +440,7 @@ bool WallInTheWay(const CoordsXYRangedZ& fencePos, int32_t direction)
{
TileElement* tileElement;
tileElement = map_get_first_element_at(fencePos);
tileElement = MapGetFirstElementAt(fencePos);
if (tileElement == nullptr)
return false;
do
@@ -468,7 +468,7 @@ static PathElement* FootpathConnectCornersGetNeighbour(const CoordsXYZ& footpath
return nullptr;
}
TileElement* tileElement = map_get_first_element_at(footpathPos);
TileElement* tileElement = MapGetFirstElementAt(footpathPos);
if (tileElement == nullptr)
return nullptr;
do
@@ -641,7 +641,7 @@ static void FoopathNeighbourListSort(rct_neighbour_list* neighbourList)
static TileElement* FootpathGetElement(const CoordsXYRangedZ& footpathPos, int32_t direction)
{
TileElement* tileElement = map_get_first_element_at(footpathPos);
TileElement* tileElement = MapGetFirstElementAt(footpathPos);
if (tileElement == nullptr)
return nullptr;
do
@@ -835,7 +835,7 @@ static void loc_6A6D7E(
}
else
{
TileElement* tileElement = map_get_first_element_at(targetPos);
TileElement* tileElement = MapGetFirstElementAt(targetPos);
if (tileElement == nullptr)
return;
do
@@ -1093,7 +1093,7 @@ void FootpathChainRideQueue(
}
auto targetQueuePos = curQueuePos + CoordsDirectionDelta[direction];
tileElement = map_get_first_element_at(targetQueuePos);
tileElement = MapGetFirstElementAt(targetQueuePos);
bool foundQueue = false;
if (tileElement != nullptr)
{
@@ -1223,7 +1223,7 @@ void FootpathUpdateQueueChains()
if (station.Entrance.IsNull())
continue;
TileElement* tileElement = map_get_first_element_at(station.Entrance);
TileElement* tileElement = MapGetFirstElementAt(station.Entrance);
if (tileElement != nullptr)
{
do
@@ -1250,7 +1250,7 @@ void FootpathUpdateQueueChains()
*/
static void FootpathFixOwnership(const CoordsXY& mapPos)
{
const auto* surfaceElement = map_get_surface_element_at(mapPos);
const auto* surfaceElement = MapGetSurfaceElementAt(mapPos);
uint16_t ownership;
// Unlikely to be NULL unless deliberate.
@@ -1402,7 +1402,7 @@ static int32_t FootpathIsConnectedToMapEdgeHelper(CoordsXYZ footpathPos, int32_t
return FOOTPATH_SEARCH_SUCCESS;
}
tileElement = map_get_first_element_at(targetPos);
tileElement = MapGetFirstElementAt(targetPos);
if (tileElement == nullptr)
return currentTile.level == 1 ? FOOTPATH_SEARCH_NOT_FOUND : FOOTPATH_SEARCH_INCOMPLETE;
@@ -1778,7 +1778,7 @@ void PathElement::SetShouldDrawPathOverSupports(bool on)
*/
static void FootpathClearWide(const CoordsXY& footpathPos)
{
TileElement* tileElement = map_get_first_element_at(footpathPos);
TileElement* tileElement = MapGetFirstElementAt(footpathPos);
if (tileElement == nullptr)
return;
do
@@ -1797,7 +1797,7 @@ static void FootpathClearWide(const CoordsXY& footpathPos)
*/
static TileElement* FootpathCanBeWide(const CoordsXYZ& footpathPos)
{
TileElement* tileElement = map_get_first_element_at(footpathPos);
TileElement* tileElement = MapGetFirstElementAt(footpathPos);
if (tileElement == nullptr)
return nullptr;
do
@@ -1844,7 +1844,7 @@ void FootpathUpdatePathWideFlags(const CoordsXY& footpathPos)
// FootpathClearWide(x, y);
// y -= 0x20;
TileElement* tileElement = map_get_first_element_at(footpathPos);
TileElement* tileElement = MapGetFirstElementAt(footpathPos);
if (tileElement == nullptr)
return;
do
@@ -2083,7 +2083,7 @@ static void FootpathRemoveEdgesTowardsHere(
Direction shiftedDirection = (direction + 1) & 3;
auto targetFootPathPos = CoordsXYZ{ CoordsXY{ footpathPos } + CoordsDirectionDelta[shiftedDirection], footpathPos.z };
tileElement = map_get_first_element_at(targetFootPathPos);
tileElement = MapGetFirstElementAt(targetFootPathPos);
if (tileElement == nullptr)
return;
do
@@ -2114,7 +2114,7 @@ static void FootpathRemoveEdgesTowards(const CoordsXYRangedZ& footPathPos, int32
return;
}
TileElement* tileElement = map_get_first_element_at(footPathPos);
TileElement* tileElement = MapGetFirstElementAt(footPathPos);
if (tileElement == nullptr)
return;
do
@@ -2153,7 +2153,7 @@ static void FootpathRemoveEdgesTowards(const CoordsXYRangedZ& footPathPos, int32
// entrances and exits, shops, paths).
bool TileElementWantsPathConnectionTowards(const TileCoordsXYZD& coords, const TileElement* const elementToBeRemoved)
{
TileElement* tileElement = map_get_first_element_at(coords);
TileElement* tileElement = MapGetFirstElementAt(coords);
if (tileElement == nullptr)
return false;
do
@@ -2245,7 +2245,7 @@ static void FootpathFixCornersAround(const TileCoordsXY& footpathPos, TileElemen
if (xOffset == 0 && yOffset == 0)
continue;
TileElement* tileElement = map_get_first_element_at(
TileElement* tileElement = MapGetFirstElementAt(
TileCoordsXY{ footpathPos.x + xOffset, footpathPos.y + yOffset }.ToCoordsXY());
if (tileElement == nullptr)
continue;