mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity

Move static initialization out and fix bounds check

Browse Source
This commit is contained in:
ZehMatt
2021-07-30 02:14:23 +03:00
parent 0f74591f40
commit ee129db4e0
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2/peep/Peep.cpp
View File

@@ -1460,6 +1460,13 @@ void Peep::FormatActionTo(Formatter& ft) const
}
}
static constexpr const rct_string_id _staffNames[] = {
STR_HANDYMAN_X,
STR_MECHANIC_X,
STR_SECURITY_GUARD_X,
STR_ENTERTAINER_X,
};
void Peep::FormatNameTo(Formatter& ft) const
{
if (Name == nullptr)
@@ -1467,20 +1474,13 @@ void Peep::FormatNameTo(Formatter& ft) const
auto* staff = As<Staff>();
if (staff != nullptr)
{
static constexpr const rct_string_id staffNames[] = {
STR_HANDYMAN_X,
STR_MECHANIC_X,
STR_SECURITY_GUARD_X,
STR_ENTERTAINER_X,
};
auto staffNameIndex = static_cast<uint8_t>(staff->AssignedStaffType);
if (staffNameIndex > sizeof(staffNames))
if (staffNameIndex >= std::size(_staffNames))
{
staffNameIndex = 0;
}
ft.Add<rct_string_id>(staffNames[staffNameIndex]);
ft.Add<rct_string_id>(_staffNames[staffNameIndex]);
ft.Add<uint32_t>(Id);
}
else if (gParkFlags & PARK_FLAGS_SHOW_REAL_GUEST_NAMES)