diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 120188ad03..d5f3ea4ba4 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -817,11 +817,11 @@ bool scenery_is_invented(uint16 sceneryItem) return invented; } -bool scenery_set_is_invented(sint32 scenerySetIndex) +bool scenery_group_is_invented(sint32 sgIndex) { auto invented = false; - const auto scenerySetEntry = get_scenery_group_entry(scenerySetIndex); - if (scenerySetEntry != nullptr && scenerySetEntry->entry_count > 0) + const auto sgEntry = get_scenery_group_entry(sgIndex); + if (sgEntry != nullptr && sgEntry->entry_count > 0) { if (gCheatsIgnoreResearchStatus) { @@ -829,9 +829,9 @@ bool scenery_set_is_invented(sint32 scenerySetIndex) } else { - for (auto i = 0; i < scenerySetEntry->entry_count; i++) + for (auto i = 0; i < sgEntry->entry_count; i++) { - auto sceneryEntryIndex = scenerySetEntry->scenery_entries[i]; + auto sceneryEntryIndex = sgEntry->scenery_entries[i]; if (scenery_is_invented(sceneryEntryIndex)) { invented = true; diff --git a/src/openrct2/management/Research.h b/src/openrct2/management/Research.h index 77cef7dbfc..bb5e6a8e23 100644 --- a/src/openrct2/management/Research.h +++ b/src/openrct2/management/Research.h @@ -118,7 +118,7 @@ void research_insert_scenery_group_entry(uint8 entryIndex, bool researched); bool ride_type_is_invented(sint32 rideType); bool ride_entry_is_invented(sint32 rideEntryIndex); bool track_piece_is_available_for_ride_type(uint8 rideType, sint32 trackType); -bool scenery_set_is_invented(sint32 scenerySetIndex); +bool scenery_group_is_invented(sint32 sgIndex); bool scenery_is_invented(uint16 sceneryItem); void reset_researched_scenery_items(); void reset_researched_ride_types_and_entries(); diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index 3da6c4b318..2af243b38f 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -1659,10 +1659,10 @@ uint32 staff_get_available_entertainer_costumes() uint32 entertainerCostumes = 0; for (sint32 i = 0; i < MAX_SCENERY_GROUP_OBJECTS; i++) { - if (scenery_set_is_invented(i)) + if (scenery_group_is_invented(i)) { - rct_scenery_set_entry * scenery_entry = get_scenery_group_entry(i); - entertainerCostumes |= scenery_entry->entertainer_costumes; + const auto sgEntry = get_scenery_group_entry(i); + entertainerCostumes |= sgEntry->entertainer_costumes; } }