mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use RequiredSelectedObjects

This commit is contained in:
Marijn van der Werf 2016-08-11 20:52:56 +02:00
parent 8889530869
commit 69bbf7ea3b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/windows/editor_inventions_list.c
View File

@ -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))

3
src/windows/editor_object_selection.c
View File

@ -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