From 6cbea2fd37ba0497df08aba20eb97f3dcdd106a4 Mon Sep 17 00:00:00 2001 From: Ted John Date: Wed, 22 Apr 2020 23:20:54 +0100 Subject: [PATCH] Change baseZ / clearanceZ to baseHeight / clearanceHeight --- distribution/openrct2.d.ts | 4 ++-- src/openrct2/scripting/ScTile.hpp | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/distribution/openrct2.d.ts b/distribution/openrct2.d.ts index 92d33e6a25..7713bf7c3c 100644 --- a/distribution/openrct2.d.ts +++ b/distribution/openrct2.d.ts @@ -309,8 +309,8 @@ declare global { interface BaseTileElement { type: TileElementType; - baseZ: number; - clearanceZ: number; + baseHeight: number; + clearanceHeight: number; } interface SurfaceElement extends BaseTileElement { diff --git a/src/openrct2/scripting/ScTile.hpp b/src/openrct2/scripting/ScTile.hpp index 0411c415a6..e00584a955 100644 --- a/src/openrct2/scripting/ScTile.hpp +++ b/src/openrct2/scripting/ScTile.hpp @@ -95,21 +95,21 @@ namespace OpenRCT2::Scripting map_invalidate_tile_full(_coords); } - uint8_t baseZ_get() const + uint8_t baseHeight_get() const { return _element->base_height; } - void baseZ_set(uint8_t newBaseHeight) + void baseHeight_set(uint8_t newBaseHeight) { ThrowIfGameStateNotMutable(); _element->base_height = newBaseHeight; } - uint8_t clearanceZ_get() const + uint8_t clearanceHeight_get() const { return _element->clearance_height; } - void clearanceZ_set(uint8_t newClearanceHeight) + void clearanceHeight_set(uint8_t newClearanceHeight) { ThrowIfGameStateNotMutable(); _element->clearance_height = newClearanceHeight; @@ -824,8 +824,9 @@ namespace OpenRCT2::Scripting { // All dukglue_register_property(ctx, &ScTileElement::type_get, &ScTileElement::type_set, "type"); - dukglue_register_property(ctx, &ScTileElement::baseZ_get, &ScTileElement::baseZ_set, "baseZ"); - dukglue_register_property(ctx, &ScTileElement::clearanceZ_get, &ScTileElement::clearanceZ_set, "clearanceZ"); + dukglue_register_property(ctx, &ScTileElement::baseHeight_get, &ScTileElement::baseHeight_set, "baseHeight"); + dukglue_register_property( + ctx, &ScTileElement::clearanceHeight_get, &ScTileElement::clearanceHeight_set, "clearanceHeight"); // Some dukglue_register_property(ctx, &ScTileElement::object_get, &ScTileElement::object_set, "object");