mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 20:43:04 +01:00
Code Issues Releases Wiki Activity

Rename var_07 to ClearanceZ in struct PreviewTrack

Browse Source
This commit is contained in:
Severin Paul Höfer
2024-01-30 23:57:15 +01:00
parent fdbdbd405f
commit aefc07c9c5
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/RideConstruction.cpp
View File

@@ -2622,7 +2622,7 @@ private:
CoordsXY coords = originCoords + offsets.Rotate(trackDirection);
int32_t baseZ = originZ + trackBlock->z;
int32_t clearanceZ = trackBlock->var_07 + clearanceHeight + baseZ + (4 * COORDS_Z_STEP);
int32_t clearanceZ = trackBlock->ClearanceZ + clearanceHeight + baseZ + (4 * COORDS_Z_STEP);
auto centreTileCoords = TileCoordsXY{ coords };
auto eastTileCoords = centreTileCoords + TileDirectionDelta[TILE_ELEMENT_DIRECTION_EAST];

4
src/openrct2/actions/TrackPlaceAction.cpp
View File

@@ -232,7 +232,7 @@ GameActions::Result TrackPlaceAction::Query() const
int32_t baseZ = Floor2(mapLoc.z, COORDS_Z_STEP);
int32_t clearanceZ = trackBlock->var_07;
int32_t clearanceZ = trackBlock->ClearanceZ;
if (trackBlock->flags & RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL && clearanceHeight > 24)
{
clearanceZ += 24;
@@ -450,7 +450,7 @@ GameActions::Result TrackPlaceAction::Execute() const
auto quarterTile = trackBlock->var_08.Rotate(_origin.direction);
int32_t baseZ = Floor2(mapLoc.z, COORDS_Z_STEP);
int32_t clearanceZ = trackBlock->var_07;
int32_t clearanceZ = trackBlock->ClearanceZ;
if (trackBlock->flags & RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL && clearanceHeight > 24)
{
clearanceZ += 24;

2
src/openrct2/ride/Track.h
View File

@@ -79,7 +79,7 @@ struct PreviewTrack
int16_t x; // 0x01
int16_t y; // 0x03
int16_t z; // 0x05
uint8_t var_07;
uint8_t ClearanceZ;
QuarterTile var_08;
uint8_t flags;
};