From 69bbf7ea3bbc9d031ff1897c4f4b168c2d074e4a Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Thu, 11 Aug 2016 20:52:56 +0200 Subject: [PATCH] Use RequiredSelectedObjects --- src/windows/editor_inventions_list.c | 7 ++++--- src/windows/editor_object_selection.c | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/windows/editor_inventions_list.c b/src/windows/editor_inventions_list.c index 66119e0de9..e8e7ce013f 100644 --- a/src/windows/editor_inventions_list.c +++ b/src/windows/editor_inventions_list.c @@ -249,6 +249,8 @@ static void research_rides_setup(){ } } +extern rct_object_entry RequiredSelectedObjects[7]; + /** * * rct2: 0x0068590C @@ -256,9 +258,8 @@ static void research_rides_setup(){ */ static void research_scenery_sets_setup(){ - for (rct_object_entry* object = RCT2_ADDRESS(0x0098DA74, rct_object_entry); - (object->flags & 0xFF) != 0xFF; - object++){ + for (int i = 0; i < countof(RequiredSelectedObjects); i++) { + rct_object_entry * object = &RequiredSelectedObjects[i]; uint8 entry_type, entry_index; if (!find_object_in_entry_group(object, &entry_type, &entry_index)) diff --git a/src/windows/editor_object_selection.c b/src/windows/editor_object_selection.c index 4e42e41c5e..40f601cbd6 100644 --- a/src/windows/editor_object_selection.c +++ b/src/windows/editor_object_selection.c @@ -249,7 +249,8 @@ static void filter_update_counts(); void reset_selected_object_count_and_size(); static int sub_6AB211(); -static rct_object_entry RequiredSelectedObjects[] = { +/** rct2: 0x0098DA74 */ +rct_object_entry RequiredSelectedObjects[] = { // Objects that are always required { 0x00000087, { "SCGTREES" }, 0 }, // Scenery: Trees { 0x00000087, { "SCGSHRUB" }, 0 }, // Scenery: Shrubs and Ornaments