From 461655f3f694e6ee97a7072183d239feb10dee2d Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Wed, 11 Feb 2015 19:59:31 +0000 Subject: [PATCH] Fix hang caused by no rideIndex being passed --- src/ride/ride.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ride/ride.c b/src/ride/ride.c index b6db115d1f..0568788e9b 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -2956,9 +2956,9 @@ void sub_6B4D26(int rideIndex, rct_xy_element *startElement) * * rct2: 0x006DD84C */ -int sub_6DD84C(rct_ride *ride, rct_xy_element *element, int isApplying) +int sub_6DD84C(rct_ride *ride, int rideIndex, rct_xy_element *element, int isApplying) { - return RCT2_CALLPROC_X(0x006DD84C, element->x, isApplying, element->y, 0, (int)ride, (int)element->element, 0) & 0x100; + return RCT2_CALLPROC_X(0x006DD84C, element->x, isApplying, element->y, rideIndex, (int)ride, (int)element->element, 0) & 0x100; } /** @@ -3200,7 +3200,7 @@ int ride_is_valid_for_open(int rideIndex, int goingToBeOpen, int isApplying) !(RCT2_GLOBAL(RCT2_ADDRESS_RIDE_FLAGS + (ride->type * 8), uint32) & 0x2000) && !(ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) ) { - if (sub_6DD84C(ride, &trackElement, isApplying)) + if (sub_6DD84C(ride, rideIndex, &trackElement, isApplying)) return 0; }