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

Part of #21421: Refactor TILE_ELEMENT_TYPE_MASK

Browse Source
This commit is contained in:
Claudio Tiecher
2024-03-17 15:17:01 +01:00
parent e5ff6b271a
commit c6def2d0a9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/rct12/RCT12.cpp
View File

@@ -31,7 +31,7 @@ using namespace OpenRCT2;
RCT12TileElementType RCT12TileElementBase::GetType() const
{
auto elem_type = static_cast<RCT12TileElementType>((this->Type & TILE_ELEMENT_TYPE_MASK) >> 2);
auto elem_type = static_cast<RCT12TileElementType>((this->Type & kTileElementTypeMask) >> 2);
switch (elem_type)
{
case RCT12TileElementType::Surface:

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

@@ -701,7 +701,7 @@ enum
};
constexpr uint8_t kTileElementQuadrantMask{ 0b11000000 };
#define TILE_ELEMENT_TYPE_MASK 0b00111100
constexpr uint8_t kTileElementTypeMask{ 0b00111100 };
#define TILE_ELEMENT_DIRECTION_MASK 0b00000011
#define TILE_ELEMENT_OCCUPIED_QUADRANTS_MASK 0b00001111

6
src/openrct2/world/TileElementBase.cpp
View File

@@ -12,13 +12,13 @@
TileElementType TileElementBase::GetType() const
{
return static_cast<TileElementType>((this->Type & TILE_ELEMENT_TYPE_MASK) >> 2);
return static_cast<TileElementType>((this->Type & kTileElementTypeMask) >> 2);
}
void TileElementBase::SetType(TileElementType newType)
{
this->Type &= ~TILE_ELEMENT_TYPE_MASK;
this->Type |= ((EnumValue(newType) << 2) & TILE_ELEMENT_TYPE_MASK);
this->Type &= ~kTileElementTypeMask;
this->Type |= ((EnumValue(newType) << 2) & kTileElementTypeMask);
}
Direction TileElementBase::GetDirection() const