diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 7a9b1d334f..2a1b8a0258 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -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 diff --git a/src/openrct2/world/Footpath.h b/src/openrct2/world/Footpath.h index 1bd9488929..4a1a64e2c8 100644 --- a/src/openrct2/world/Footpath.h +++ b/src/openrct2/world/Footpath.h @@ -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