mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-02 19:56:13 +01:00
Code Issues Releases Wiki Activity

Rename classes with snakes OpenRCT2/A*-F* (#19215)

Browse Source 
* Rename classes with snakes OpenRCT2/A*-F*

* Clang format files
This commit is contained in:
Duncan
2023-01-19 08:16:44 +00:00
committed by GitHub
parent 59736ecfbc
commit 859b071ddc
209 changed files with 932 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -560,7 +560,7 @@ static void FootpathConnectCorners(const CoordsXY& footpathPos, PathElement* ini
}
}
struct rct_neighbour
struct FootpathNeighbour
{
uint8_t order;
uint8_t direction;
@@ -568,23 +568,23 @@ struct rct_neighbour
StationIndex entrance_index;
};
struct rct_neighbour_list
struct FootpathNeighbourList
{
rct_neighbour items[8];
FootpathNeighbour items[8];
size_t count;
};
static int32_t FootpathNeighbourCompare(const void* a, const void* b)
{
uint8_t va = (static_cast<const rct_neighbour*>(a))->order;
uint8_t vb = (static_cast<const rct_neighbour*>(b))->order;
uint8_t va = (static_cast<const FootpathNeighbour*>(a))->order;
uint8_t vb = (static_cast<const FootpathNeighbour*>(b))->order;
if (va < vb)
return 1;
if (va > vb)
return -1;
uint8_t da = (static_cast<const rct_neighbour*>(a))->direction;
uint8_t db = (static_cast<const rct_neighbour*>(b))->direction;
uint8_t da = (static_cast<const FootpathNeighbour*>(a))->direction;
uint8_t db = (static_cast<const FootpathNeighbour*>(b))->direction;
if (da < db)
return -1;
if (da > db)
@@ -592,13 +592,13 @@ static int32_t FootpathNeighbourCompare(const void* a, const void* b)
return 0;
}
static void FootpathNeighbourListInit(rct_neighbour_list* neighbourList)
static void FootpathNeighbourListInit(FootpathNeighbourList* neighbourList)
{
neighbourList->count = 0;
}
static void FootpathNeighbourListPush(
rct_neighbour_list* neighbourList, int32_t order, int32_t direction, RideId rideIndex, ::StationIndex entrance_index)
FootpathNeighbourList* neighbourList, int32_t order, int32_t direction, RideId rideIndex, ::StationIndex entrance_index)
{
Guard::Assert(neighbourList->count < std::size(neighbourList->items));
neighbourList->items[neighbourList->count].order = order;
@@ -608,7 +608,7 @@ static void FootpathNeighbourListPush(
neighbourList->count++;
}
static bool FootpathNeighbourListPop(rct_neighbour_list* neighbourList, rct_neighbour* outNeighbour)
static bool FootpathNeighbourListPop(FootpathNeighbourList* neighbourList, FootpathNeighbour* outNeighbour)
{
if (neighbourList->count == 0)
return false;
@@ -620,20 +620,20 @@ static bool FootpathNeighbourListPop(rct_neighbour_list* neighbourList, rct_neig
return true;
}
static void FootpathNeighbourListRemove(rct_neighbour_list* neighbourList, size_t index)
static void FootpathNeighbourListRemove(FootpathNeighbourList* neighbourList, size_t index)
{
Guard::ArgumentInRange<size_t>(index, 0, neighbourList->count - 1);
int32_t itemsRemaining = static_cast<int32_t>(neighbourList->count - index) - 1;
if (itemsRemaining > 0)
{
memmove(&neighbourList->items[index], &neighbourList->items[index + 1], sizeof(rct_neighbour) * itemsRemaining);
memmove(&neighbourList->items[index], &neighbourList->items[index + 1], sizeof(FootpathNeighbour) * itemsRemaining);
}
neighbourList->count--;
}
static void FoopathNeighbourListSort(rct_neighbour_list* neighbourList)
static void FoopathNeighbourListSort(FootpathNeighbourList* neighbourList)
{
qsort(neighbourList->items, neighbourList->count, sizeof(rct_neighbour), FootpathNeighbourCompare);
qsort(neighbourList->items, neighbourList->count, sizeof(FootpathNeighbour), FootpathNeighbourCompare);
}
static TileElement* FootpathGetElement(const CoordsXYRangedZ& footpathPos, int32_t direction)
@@ -766,7 +766,7 @@ static void Loc6A6FD2(const CoordsXYZ& initialTileElementPos, int32_t direction,
static void Loc6A6F1F(
const CoordsXYZ& initialTileElementPos, int32_t direction, TileElement* tileElement, TileElement* initialTileElement,
const CoordsXY& targetPos, int32_t flags, bool query, rct_neighbour_list* neighbourList)
const CoordsXY& targetPos, int32_t flags, bool query, FootpathNeighbourList* neighbourList)
{
if (query)
{
@@ -819,7 +819,7 @@ static void Loc6A6F1F(
static void Loc6A6D7E(
const CoordsXYZ& initialTileElementPos, int32_t direction, TileElement* initialTileElement, int32_t flags, bool query,
rct_neighbour_list* neighbourList)
FootpathNeighbourList* neighbourList)
{
auto targetPos = CoordsXY{ initialTileElementPos } + CoordsDirectionDelta[direction];
if (((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) || gCheatsSandboxMode) && MapIsEdge(targetPos))
@@ -933,7 +933,7 @@ static void Loc6A6D7E(
// TODO: Change this into a simple check that validates if the direction should be fully checked with Loc6A6D7E and move the
// calling of Loc6A6D7E into the parent function.
static void Loc6A6C85(
const CoordsXYE& tileElementPos, int32_t direction, int32_t flags, bool query, rct_neighbour_list* neighbourList)
const CoordsXYE& tileElementPos, int32_t direction, int32_t flags, bool query, FootpathNeighbourList* neighbourList)
{
if (query
&& WallInTheWay(
@@ -1001,8 +1001,8 @@ static void Loc6A6C85(
*/
void FootpathConnectEdges(const CoordsXY& footpathPos, TileElement* tileElement, int32_t flags)
{
rct_neighbour_list neighbourList;
rct_neighbour neighbour;
FootpathNeighbourList neighbourList;
FootpathNeighbour neighbour;
FootpathUpdateQueueChains();
@@ -2388,7 +2388,7 @@ static bool FootpathIsLegacyPathEntryOkay(ObjectEntryIndex index)
auto footpathObj = static_cast<FootpathObject*>(objManager.GetLoadedObject(ObjectType::Paths, index));
if (footpathObj != nullptr)
{
auto pathEntry = reinterpret_cast<rct_footpath_entry*>(footpathObj->GetLegacyData());
auto pathEntry = reinterpret_cast<FootpathEntry*>(footpathObj->GetLegacyData());
return showEditorPaths || !(pathEntry->flags & FOOTPATH_ENTRY_FLAG_SHOW_ONLY_IN_SCENARIO_EDITOR);
}
return false;