mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 14:02:59 +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

11
src/openrct2/ride/TrackDesign.cpp
View File

@@ -58,6 +58,7 @@
#include "../world/Scenery.h"
#include "../world/Surface.h"
#include "../world/Wall.h"
#include "../world/tile_element/Slope.h"
#include "Ride.h"
#include "RideData.h"
#include "Track.h"
@@ -1524,10 +1525,10 @@ static GameActions::Result TrackDesignPlaceMaze(
if (surfaceElement == nullptr)
continue;
int16_t surfaceZ = surfaceElement->GetBaseZ();
if (surfaceElement->GetSlope() & TILE_ELEMENT_SLOPE_ALL_CORNERS_UP)
if (surfaceElement->GetSlope() & kTileSlopeRaisedCornersMask)
{
surfaceZ += LAND_HEIGHT_STEP;
if (surfaceElement->GetSlope() & TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT)
if (surfaceElement->GetSlope() & kTileSlopeDiagonalFlag)
{
surfaceZ += LAND_HEIGHT_STEP;
}
@@ -1690,10 +1691,10 @@ static GameActions::Result TrackDesignPlaceRide(TrackDesignState& tds, TrackDesi
}
int32_t surfaceZ = surfaceElement->GetBaseZ();
if (surfaceElement->GetSlope() & TILE_ELEMENT_SLOPE_ALL_CORNERS_UP)
if (surfaceElement->GetSlope() & kTileSlopeRaisedCornersMask)
{
surfaceZ += LAND_HEIGHT_STEP;
if (surfaceElement->GetSlope() & TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT)
if (surfaceElement->GetSlope() & kTileSlopeDiagonalFlag)
{
surfaceZ += LAND_HEIGHT_STEP;
}
@@ -2111,7 +2112,7 @@ static void TrackDesignPreviewClearMap()
auto* element = &tileElements.emplace_back();
element->ClearAs(TileElementType::Surface);
element->SetLastForTile(true);
element->AsSurface()->SetSlope(TILE_ELEMENT_SLOPE_FLAT);
element->AsSurface()->SetSlope(kTileSlopeFlat);
element->AsSurface()->SetWaterHeight(0);
element->AsSurface()->SetSurfaceObjectIndex(0);
element->AsSurface()->SetEdgeObjectIndex(0);