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

Refactor slope flags

Browse Source
This commit is contained in:
Gymnasiast
2024-05-02 23:31:01 +02:00
parent 9e2463ff52
commit 4cdaaa9810
35 changed files with 757 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2-ui/windows/Map.cpp
View File

@@ -37,6 +37,7 @@
#include <openrct2/world/Footpath.h>
#include <openrct2/world/Scenery.h>
#include <openrct2/world/Surface.h>
#include <openrct2/world/tile_element/Slope.h>
#include <vector>
namespace OpenRCT2::Ui::Windows
@@ -584,10 +585,10 @@ static Widget window_map_widgets[] = {
if (parkEntranceMapPosition.z == 0)
{
parkEntranceMapPosition.z = surfaceElement->GetBaseZ();
if ((surfaceElement->GetSlope() & TILE_ELEMENT_SLOPE_ALL_CORNERS_UP) != 0)
if ((surfaceElement->GetSlope() & kTileSlopeRaisedCornersMask) != 0)
{
parkEntranceMapPosition.z += 16;
if (surfaceElement->GetSlope() & TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT)
if (surfaceElement->GetSlope() & kTileSlopeDiagonalFlag)
{
parkEntranceMapPosition.z += 16;
}
@@ -672,9 +673,9 @@ static Widget window_map_widgets[] = {
int32_t mapZ = tileElement->GetBaseZ();
if (tileElement->GetType() == TileElementType::Surface)
{
if ((tileElement->AsSurface()->GetSlope() & TILE_ELEMENT_SLOPE_ALL_CORNERS_UP) != 0)
if ((tileElement->AsSurface()->GetSlope() & kTileSlopeRaisedCornersMask) != 0)
mapZ += 16;
if (tileElement->AsSurface()->GetSlope() & TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT)
if (tileElement->AsSurface()->GetSlope() & kTileSlopeDiagonalFlag)
mapZ += 16;
}