From 84145a258d700fdc1f5ec7eefa6f5a679d297aea Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Fri, 5 Oct 2018 14:18:44 +0200 Subject: [PATCH] Fix very misleading use of tileElement->type in a union It was a sprite, accessed as if it was a tileElement. Neither the method nor the resulting code made any sense. --- src/openrct2-ui/interface/ViewportInteraction.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index c7cfb2c3aa..60b8e63380 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -211,15 +211,15 @@ int32_t viewport_interaction_get_item_right(int32_t x, int32_t y, viewport_inter info->x = mapCoord.x; info->y = mapCoord.y; tileElement = info->tileElement; + rct_sprite* sprite = info->sprite; switch (info->type) { case VIEWPORT_INTERACTION_ITEM_SPRITE: - if ((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) || tileElement->type != 0) + if ((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) || sprite->generic.sprite_identifier != SPRITE_IDENTIFIER_VEHICLE) return info->type = VIEWPORT_INTERACTION_ITEM_NONE; - tileElement += 6; - ride = get_ride(tileElement->type); + ride = get_ride(sprite->vehicle.ride); if (ride->status == RIDE_STATUS_CLOSED) { set_map_tooltip_format_arg(0, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY);