From 757d705e1326d7e3ce75c529b24060df0736a0b7 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Wed, 26 Sep 2018 12:02:41 +0200 Subject: [PATCH] Add private fields --- src/openrct2/world/Entrance.cpp | 6 +++--- src/openrct2/world/TileElement.h | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index e5b207d65b..a7f655c7d7 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -633,11 +633,11 @@ void fix_park_entrance_locations(void) uint8_t EntranceElement::GetStationIndex() const { - return (temp.index & MAP_ELEM_TRACK_SEQUENCE_STATION_INDEX_MASK) >> 4; + return (index & MAP_ELEM_TRACK_SEQUENCE_STATION_INDEX_MASK) >> 4; } void EntranceElement::SetStationIndex(uint8_t stationIndex) { - temp.index &= ~MAP_ELEM_TRACK_SEQUENCE_STATION_INDEX_MASK; - temp.index |= (stationIndex << 4); + index &= ~MAP_ELEM_TRACK_SEQUENCE_STATION_INDEX_MASK; + index |= (stationIndex << 4); } diff --git a/src/openrct2/world/TileElement.h b/src/openrct2/world/TileElement.h index bb8aa6a378..a02462b8ff 100644 --- a/src/openrct2/world/TileElement.h +++ b/src/openrct2/world/TileElement.h @@ -374,7 +374,11 @@ assert_struct_size(WallElement, 8); struct EntranceElement : TileElementBase { - rct_tile_element_entrance_properties temp; +private: + uint8_t entranceType; // 4 + uint8_t index; // 5 + uint8_t pathType; // 6 + uint8_t rideIndex; // 7 public: uint8_t GetStationIndex() const;