From ee35f9fb4f66f6bb1cc9842fa20bbb6296466afa Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Wed, 3 Dec 2014 20:19:02 +0000 Subject: [PATCH 1/2] Fix #615. Issue caused by variables not being set --- src/ride/ride.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ride/ride.c b/src/ride/ride.c index 0ddf613ac3..b685915043 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -885,8 +885,8 @@ int ride_modify(rct_map_element *mapElement, int x, int y) if (ride->type == RIDE_TYPE_MAZE) return ride_modify_maze(mapElement, x, y); - if (RCT2_GLOBAL(0x0097CF40 + (ride->type * 8), uint32) & 0x100) { - int outX, outY; + if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_FLAGS,uint64)[ride->type] & 0x100) { + int outX = x, outY = y; mapElement = ride_find_track_gap(mapElement, &outX, &outY); } From ef0b29d9961361ccc2643755735c90f327edc49d Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Wed, 3 Dec 2014 20:37:38 +0000 Subject: [PATCH 2/2] Fixed issue preventing rides from being destroyed --- src/windows/ride_construction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c index 22c0b2caf1..2e9a31a637 100644 --- a/src/windows/ride_construction.c +++ b/src/windows/ride_construction.c @@ -139,7 +139,7 @@ rct_window *window_construction_open() w = window_create(0, 29, 166, 394, (uint32*)window_construction_events, WC_RIDE_CONSTRUCTION, WF_9); w->widgets = (rct_widget*)0x9D7A90; - w->enabled_widgets = 0x67C4FFFFEF; + w->enabled_widgets = 0x67EFFFFFC4; window_init_scroll_widgets(w);