From 5504471715c2e0b5dee4cea92899cc7f045f0221 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Wed, 8 Feb 2017 23:22:25 +0100 Subject: [PATCH] Fix #5188: Clicking on a Magic Carpet doesn't open the ride window --- src/openrct2/ride/thrill/magic_carpet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/openrct2/ride/thrill/magic_carpet.c b/src/openrct2/ride/thrill/magic_carpet.c index fd2c17bc0f..e9d22a32fa 100644 --- a/src/openrct2/ride/thrill/magic_carpet.c +++ b/src/openrct2/ride/thrill/magic_carpet.c @@ -155,12 +155,14 @@ static void paint_magic_carpet_vehicle(rct_ride *ride, uint8 direction, uint32 s /** rct2: 0x00899104 */ static void paint_magic_carpet_structure(rct_ride *ride, uint8 direction, sint8 axisOffset, uint16 height) { + rct_map_element * savedMapElement = g_currently_drawn_item; rct_vehicle *vehicle = get_first_vehicle(ride); uint32 swingImageId = 0; if (vehicle != NULL) { swingImageId = vehicle->vehicle_sprite_type; gPaintInteractionType = VIEWPORT_INTERACTION_ITEM_SPRITE; + g_currently_drawn_item = vehicle; } bound_box bb = MagicCarpetBounds[direction]; @@ -182,6 +184,7 @@ static void paint_magic_carpet_structure(rct_ride *ride, uint8 direction, sint8 paint_magic_carpet_frame(PLANE_FRONT, direction, offset, bbOffset, bbSize); gPaintInteractionType = VIEWPORT_INTERACTION_ITEM_RIDE; + g_currently_drawn_item = savedMapElement; } /** rct2: 0x00898514 */