mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity

Rename FOOTPATH_ELEMENT_FLAGS2_PATH_ENTRY to FOOTPATH_ELEMENT_FLAGS2_LEGACY_PATH_ENTRY

Browse Source
This commit is contained in:
Gymnasiast
2021-04-21 22:28:56 +02:00
parent 3f294daf23
commit 59ff3f2eb9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1664,7 +1664,7 @@ FootpathObject* PathElement::GetPathEntry() const
ObjectEntryIndex PathElement::GetPathEntryIndex() const
{
if (Flags2 & FOOTPATH_ELEMENT_FLAGS2_PATH_ENTRY)
if (Flags2 & FOOTPATH_ELEMENT_FLAGS2_LEGACY_PATH_ENTRY)
return SurfaceIndex;
else
return OBJECT_ENTRY_INDEX_NULL;
@@ -1674,12 +1674,12 @@ void PathElement::SetPathEntryIndex(ObjectEntryIndex newIndex)
{
SurfaceIndex = newIndex;
RailingsIndex = OBJECT_ENTRY_INDEX_NULL;
Flags2 |= FOOTPATH_ELEMENT_FLAGS2_PATH_ENTRY;
Flags2 |= FOOTPATH_ELEMENT_FLAGS2_LEGACY_PATH_ENTRY;
}
ObjectEntryIndex PathElement::GetSurfaceEntryIndex() const
{
if (Flags2 & FOOTPATH_ELEMENT_FLAGS2_PATH_ENTRY)
if (Flags2 & FOOTPATH_ELEMENT_FLAGS2_LEGACY_PATH_ENTRY)
return OBJECT_ENTRY_INDEX_NULL;
else
return SurfaceIndex;
@@ -1687,7 +1687,7 @@ ObjectEntryIndex PathElement::GetSurfaceEntryIndex() const
ObjectEntryIndex PathElement::GetRailingEntryIndex() const
{
if (Flags2 & FOOTPATH_ELEMENT_FLAGS2_PATH_ENTRY)
if (Flags2 & FOOTPATH_ELEMENT_FLAGS2_LEGACY_PATH_ENTRY)
return OBJECT_ENTRY_INDEX_NULL;
else
return RailingsIndex;
@@ -1714,13 +1714,13 @@ FootpathRailingsObject* PathElement::GetRailingEntry() const
void PathElement::SetSurfaceEntryIndex(ObjectEntryIndex newIndex)
{
SurfaceIndex = newIndex;
Flags2 &= ~FOOTPATH_ELEMENT_FLAGS2_PATH_ENTRY;
Flags2 &= ~FOOTPATH_ELEMENT_FLAGS2_LEGACY_PATH_ENTRY;
}
void PathElement::SetRailingEntryIndex(ObjectEntryIndex newEntryIndex)
{
RailingsIndex = newEntryIndex;
Flags2 &= ~FOOTPATH_ELEMENT_FLAGS2_PATH_ENTRY;
Flags2 &= ~FOOTPATH_ELEMENT_FLAGS2_LEGACY_PATH_ENTRY;
}
uint8_t PathElement::GetQueueBannerDirection() const

2
src/openrct2/world/Footpath.h
View File

@@ -98,7 +98,7 @@ enum
FOOTPATH_ELEMENT_FLAGS2_ADDITION_IS_GHOST = (1 << 2),
FOOTPATH_ELEMENT_FLAGS2_BLOCKED_BY_VEHICLE = (1 << 3),
FOOTPATH_ELEMENT_FLAGS2_ADDITION_IS_BROKEN = (1 << 4),
FOOTPATH_ELEMENT_FLAGS2_PATH_ENTRY = (1 << 5),
FOOTPATH_ELEMENT_FLAGS2_LEGACY_PATH_ENTRY = (1 << 5),
};
enum