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

Modify object selection to only research selected item when adding new objects during a game. (#3762)

This commit is contained in:
Duncan 2016-05-28 09:30:31 +01:00 committed by Ted John
parent 49756a6ee3
commit 8e8474c400
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/windows/editor_object_selection.c
View File

@ -775,8 +775,7 @@ static void window_editor_object_selection_close(rct_window *w)
}
else {
// Used for in-game object selection cheat
research_reset_items();
research_populate_list_researched();
// This resets the ride selection list and resets research to 0 on current item
gSilentResearch = true;
sub_684AC3();
gSilentResearch = false;
@ -1986,6 +1985,20 @@ static void editor_load_selected_objects()
if (!object_load_chunk(-1, installed_entry, &chunk_size)) {
log_error("Failed to load entry %.8s", installed_entry->name);
}
// For in game use (cheat)
if (!(gScreenFlags & SCREEN_FLAGS_EDITOR)) {
// Defaults selected items to researched.
if (find_object_in_entry_group(installed_entry, &entry_type, &entry_index)) {
if (entry_type == OBJECT_TYPE_RIDE) {
rct_ride_entry* rideType = get_ride_entry(entry_index);
research_insert(1, 0x10000 | (rideType->ride_type[0] << 8) | entry_index, rideType->category[0]);
}
else if (entry_type == OBJECT_TYPE_SCENERY_SETS) {
research_insert(1, entry_index, RESEARCH_CATEGORY_SCENERYSET);
}
}
}
}
}