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

Rename scenery set to scenery group

This commit is contained in:
Ted John 2017-11-19 20:39:13 +00:00
parent 3251af4f30
commit 110730015b
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/management/Research.cpp
View File

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

2
src/openrct2/management/Research.h
View File

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

6
src/openrct2/peep/Staff.cpp
View File

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