diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 2bb9332a0b..9db0ae2f8a 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -26,6 +26,7 @@ 01C6F0C822FD51FC0057E2F7 /* T6Exporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C6F0C522FD51FC0057E2F7 /* T6Exporter.cpp */; }; 01C6F0C922FD51FC0057E2F7 /* T6Importer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C6F0C622FD51FC0057E2F7 /* T6Importer.cpp */; }; 01DDFE6522FD608500221318 /* Window_internal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01DDFE6422FD608500221318 /* Window_internal.cpp */; }; + 20DE495F25DA8C6B00F2DF6D /* TileElementBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20DE495E25DA8C6B00F2DF6D /* TileElementBase.cpp */; }; 2A1F4FE1221FF4B0003CA045 /* Audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83571EC4E7CC00FA49E2 /* Audio.cpp */; }; 2A1F4FE2221FF4B0003CA045 /* macos.mm in Sources */ = {isa = PBXBuildFile; fileRef = F76C845D1EC4E7CC00FA49E2 /* macos.mm */; }; 2A5354E922099C4F00A5440F /* Network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A5354E822099C4F00A5440F /* Network.cpp */; }; @@ -838,6 +839,7 @@ 01C6F0C622FD51FC0057E2F7 /* T6Importer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = T6Importer.cpp; sourceTree = ""; }; 01C6F0C722FD51FC0057E2F7 /* T6Exporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = T6Exporter.h; sourceTree = ""; }; 01DDFE6422FD608500221318 /* Window_internal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Window_internal.cpp; sourceTree = ""; }; + 20DE495E25DA8C6B00F2DF6D /* TileElementBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TileElementBase.cpp; sourceTree = ""; }; 2A5354E822099C4F00A5440F /* Network.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Network.cpp; sourceTree = ""; }; 2A5354EA22099C7200A5440F /* CircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircularBuffer.h; sourceTree = ""; }; 2ADE2F21224418B1002598AF /* Random.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Random.hpp; sourceTree = ""; }; @@ -1332,8 +1334,6 @@ 9308D9FD209908090079EE96 /* Surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Surface.h; sourceTree = ""; }; 930EEA6924FC00940070314E /* ScenarioSelect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScenarioSelect.cpp; sourceTree = ""; }; 9329D51F240C17C60054301C /* BenchUpdate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BenchUpdate.cpp; sourceTree = ""; }; - 932A20CD22D73CEE00C57EDB /* GuestSetNameAction.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GuestSetNameAction.hpp; sourceTree = ""; }; - 932A20CE22D73CEE00C57EDB /* RideSetVehiclesAction.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = RideSetVehiclesAction.hpp; sourceTree = ""; }; 932A20CF22D73CEE00C57EDB /* GameActionCompat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GameActionCompat.cpp; sourceTree = ""; }; 932A20D322D73CEF00C57EDB /* GameActionRegistration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GameActionRegistration.cpp; sourceTree = ""; }; 932A20F522D73CF300C57EDB /* GameAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameAction.h; sourceTree = ""; }; @@ -3818,6 +3818,7 @@ 2ADE2F372244198A002598AF /* SpriteBase.h */, 9308D9FB209908080079EE96 /* Surface.cpp */, 9308D9FD209908090079EE96 /* Surface.h */, + 20DE495E25DA8C6B00F2DF6D /* TileElementBase.cpp */, 9308D9FA209908080079EE96 /* TileElement.cpp */, 9308D9FC209908080079EE96 /* TileElement.h */, 4C7B543E2007646A00A52E21 /* TileInspector.cpp */, @@ -4707,6 +4708,7 @@ F76C85C41EC4E88300FA49E2 /* Config.cpp in Sources */, 66A10EC4257F1DF800DD651A /* FootpathAdditionPlaceAction.cpp in Sources */, C688792920289B9B0084B384 /* Chairlift.cpp in Sources */, + 20DE495F25DA8C6B00F2DF6D /* TileElementBase.cpp in Sources */, C68878A020289B200084B384 /* LanguagePack.cpp in Sources */, F76C85C71EC4E88300FA49E2 /* IniReader.cpp in Sources */, 93F76F0020BFF77B00D4512C /* Paint.Path.cpp in Sources */, diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index d106053dd4..1623118c3d 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -868,8 +868,9 @@ + - \ No newline at end of file + diff --git a/src/openrct2/world/TileElement.cpp b/src/openrct2/world/TileElement.cpp index 3b9edb7f07..46c6ecd7bb 100644 --- a/src/openrct2/world/TileElement.cpp +++ b/src/openrct2/world/TileElement.cpp @@ -18,63 +18,6 @@ #include "Location.hpp" #include "Scenery.h" -uint8_t TileElementBase::GetType() const -{ - return this->type & TILE_ELEMENT_TYPE_MASK; -} - -void TileElementBase::SetType(uint8_t newType) -{ - this->type &= ~TILE_ELEMENT_TYPE_MASK; - this->type |= (newType & TILE_ELEMENT_TYPE_MASK); -} - -Direction TileElementBase::GetDirection() const -{ - return this->type & TILE_ELEMENT_DIRECTION_MASK; -} - -void TileElementBase::SetDirection(Direction direction) -{ - this->type &= ~TILE_ELEMENT_DIRECTION_MASK; - this->type |= (direction & TILE_ELEMENT_DIRECTION_MASK); -} - -Direction TileElementBase::GetDirectionWithOffset(uint8_t offset) const -{ - return ((this->type & TILE_ELEMENT_DIRECTION_MASK) + offset) & TILE_ELEMENT_DIRECTION_MASK; -} - -bool TileElementBase::IsLastForTile() const -{ - return (this->Flags & TILE_ELEMENT_FLAG_LAST_TILE) != 0; -} - -void TileElementBase::SetLastForTile(bool on) -{ - if (on) - Flags |= TILE_ELEMENT_FLAG_LAST_TILE; - else - Flags &= ~TILE_ELEMENT_FLAG_LAST_TILE; -} - -bool TileElementBase::IsGhost() const -{ - return (this->Flags & TILE_ELEMENT_FLAG_GHOST) != 0; -} - -void TileElementBase::SetGhost(bool isGhost) -{ - if (isGhost) - { - this->Flags |= TILE_ELEMENT_FLAG_GHOST; - } - else - { - this->Flags &= ~TILE_ELEMENT_FLAG_GHOST; - } -} - bool tile_element_is_underground(TileElement* tileElement) { do @@ -167,11 +110,6 @@ void TileElement::ClearAs(uint8_t newType) std::fill_n(pad_08, sizeof(pad_08), 0x00); } -void TileElementBase::Remove() -{ - tile_element_remove(static_cast(this)); -} - // Rotate both of the values amount const QuarterTile QuarterTile::Rotate(uint8_t amount) const { @@ -214,45 +152,3 @@ const QuarterTile QuarterTile::Rotate(uint8_t amount) const return QuarterTile{ 0 }; } } - -uint8_t TileElementBase::GetOccupiedQuadrants() const -{ - return Flags & TILE_ELEMENT_OCCUPIED_QUADRANTS_MASK; -} - -void TileElementBase::SetOccupiedQuadrants(uint8_t quadrants) -{ - Flags &= ~TILE_ELEMENT_OCCUPIED_QUADRANTS_MASK; - Flags |= (quadrants & TILE_ELEMENT_OCCUPIED_QUADRANTS_MASK); -} - -int32_t TileElementBase::GetBaseZ() const -{ - return base_height * COORDS_Z_STEP; -} - -void TileElementBase::SetBaseZ(int32_t newZ) -{ - base_height = (newZ / COORDS_Z_STEP); -} - -int32_t TileElementBase::GetClearanceZ() const -{ - return clearance_height * COORDS_Z_STEP; -} - -void TileElementBase::SetClearanceZ(int32_t newZ) -{ - clearance_height = (newZ / COORDS_Z_STEP); -} - -uint8_t TileElementBase::GetOwner() const -{ - return owner & OWNER_MASK; -} - -void TileElementBase::SetOwner(uint8_t newOwner) -{ - owner &= ~OWNER_MASK; - owner |= (newOwner & OWNER_MASK); -} diff --git a/src/openrct2/world/TileElementBase.cpp b/src/openrct2/world/TileElementBase.cpp new file mode 100644 index 0000000000..17c08b6e27 --- /dev/null +++ b/src/openrct2/world/TileElementBase.cpp @@ -0,0 +1,115 @@ +/***************************************************************************** + * Copyright (c) 2014-2021 OpenRCT2 developers + * + * For a complete list of all authors, please refer to contributors.md + * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is licensed under the GNU General Public License version 3. + *****************************************************************************/ + +#include "Map.h" +#include "TileElement.h" + +uint8_t TileElementBase::GetType() const +{ + return this->type & TILE_ELEMENT_TYPE_MASK; +} + +void TileElementBase::SetType(uint8_t newType) +{ + this->type &= ~TILE_ELEMENT_TYPE_MASK; + this->type |= (newType & TILE_ELEMENT_TYPE_MASK); +} + +Direction TileElementBase::GetDirection() const +{ + return this->type & TILE_ELEMENT_DIRECTION_MASK; +} + +void TileElementBase::SetDirection(Direction direction) +{ + this->type &= ~TILE_ELEMENT_DIRECTION_MASK; + this->type |= (direction & TILE_ELEMENT_DIRECTION_MASK); +} + +Direction TileElementBase::GetDirectionWithOffset(uint8_t offset) const +{ + return ((this->type & TILE_ELEMENT_DIRECTION_MASK) + offset) & TILE_ELEMENT_DIRECTION_MASK; +} + +bool TileElementBase::IsLastForTile() const +{ + return (this->Flags & TILE_ELEMENT_FLAG_LAST_TILE) != 0; +} + +void TileElementBase::SetLastForTile(bool on) +{ + if (on) + Flags |= TILE_ELEMENT_FLAG_LAST_TILE; + else + Flags &= ~TILE_ELEMENT_FLAG_LAST_TILE; +} + +bool TileElementBase::IsGhost() const +{ + return (this->Flags & TILE_ELEMENT_FLAG_GHOST) != 0; +} + +void TileElementBase::SetGhost(bool isGhost) +{ + if (isGhost) + { + this->Flags |= TILE_ELEMENT_FLAG_GHOST; + } + else + { + this->Flags &= ~TILE_ELEMENT_FLAG_GHOST; + } +} + +void TileElementBase::Remove() +{ + tile_element_remove(static_cast(this)); +} + +uint8_t TileElementBase::GetOccupiedQuadrants() const +{ + return Flags & TILE_ELEMENT_OCCUPIED_QUADRANTS_MASK; +} + +void TileElementBase::SetOccupiedQuadrants(uint8_t quadrants) +{ + Flags &= ~TILE_ELEMENT_OCCUPIED_QUADRANTS_MASK; + Flags |= (quadrants & TILE_ELEMENT_OCCUPIED_QUADRANTS_MASK); +} + +int32_t TileElementBase::GetBaseZ() const +{ + return base_height * COORDS_Z_STEP; +} + +void TileElementBase::SetBaseZ(int32_t newZ) +{ + base_height = (newZ / COORDS_Z_STEP); +} + +int32_t TileElementBase::GetClearanceZ() const +{ + return clearance_height * COORDS_Z_STEP; +} + +void TileElementBase::SetClearanceZ(int32_t newZ) +{ + clearance_height = (newZ / COORDS_Z_STEP); +} + +uint8_t TileElementBase::GetOwner() const +{ + return owner & OWNER_MASK; +} + +void TileElementBase::SetOwner(uint8_t newOwner) +{ + owner &= ~OWNER_MASK; + owner |= (newOwner & OWNER_MASK); +}