From aefc07c9c5db3ad88cf8da87820f74a949b9e2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20Paul=20H=C3=B6fer?= <84280965+zzril@users.noreply.github.com> Date: Tue, 30 Jan 2024 23:57:15 +0100 Subject: [PATCH] Rename var_07 to ClearanceZ in struct PreviewTrack --- src/openrct2-ui/windows/RideConstruction.cpp | 2 +- src/openrct2/actions/TrackPlaceAction.cpp | 4 ++-- src/openrct2/ride/Track.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 2eb8aff4f7..f02f361aba 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -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]; diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index 8001ac381e..0575e89b7e 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -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; diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h index 4a7b9bc6a5..6796ca2c0c 100644 --- a/src/openrct2/ride/Track.h +++ b/src/openrct2/ride/Track.h @@ -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; };