From 9801e92d794249ec09832bc933e0263403b0258e Mon Sep 17 00:00:00 2001 From: Ted John Date: Thu, 7 Jul 2016 17:50:02 +0100 Subject: [PATCH] fix track manager object filtering --- src/windows/editor_object_selection.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/windows/editor_object_selection.c b/src/windows/editor_object_selection.c index 8350eb933c..bd60391e68 100644 --- a/src/windows/editor_object_selection.c +++ b/src/windows/editor_object_selection.c @@ -472,26 +472,15 @@ static void setup_track_manager_objects() uint8 * selectionFlags = &_objectSelectionFlags[i]; const ObjectRepositoryItem * item = &items[i]; uint8 object_type = item->ObjectEntry.flags & 0xF; - if (object_type == OBJECT_TYPE_RIDE){ + if (object_type == OBJECT_TYPE_RIDE) { *selectionFlags |= OBJECT_SELECTION_FLAG_6; for (uint8 j = 0; j < 3; j++) { uint8 rideType = item->RideType[j]; - if (rideType == 0xFF) - continue; - - if (!ride_type_has_flag(rideType, RIDE_TYPE_FLAG_HAS_TRACK)) - continue; - - if (item->RideType[3] & (1 << 0)) { - *selectionFlags &= ~OBJECT_SELECTION_FLAG_6; - } else if (ride_list[rideType] & (1 << 0)) { - continue; - } else { - ride_list[rideType] |= (1 << 0); + if (rideType != 0xFF && ride_type_has_flag(rideType, RIDE_TYPE_FLAG_HAS_TRACK)) { *selectionFlags &= ~OBJECT_SELECTION_FLAG_6; + break; } - break; } } }