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

Fix #14247: Scenarios from RCT1 allow hiring too many staff

Browse Source
This commit is contained in:
Michael Steenbeek
2021-03-07 13:54:01 +01:00
committed by GitHub
parent 140cc442ac
commit 6a11dbf0c9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -59,6 +59,7 @@
- Fix: [#13961] Animation for Guests sliding down Spiral Slide is missing on close zoom levels.
- Fix: [#14012] 'Finish 5 roller coasters' goal is listed incorrectly in scenario selector.
- Fix: [#14095] Holding down [-][+] buttons does not decrease/increase number of circuits.
- Fix: [#14247] Scenarios from RCT1 allow hiring too many staff.
- Improved: [#6022] Allow up to 128 ride objects to be selected in track designer.
- Improved: [#12917] Changed peep movement so that they stay more spread out over the full width of single tile paths.
- Improved: [#13386] A GUI error message is now displayed if the language files are missing.

7
src/openrct2/rct1/S4Importer.cpp
View File

@@ -1388,11 +1388,14 @@ private:
}
}
// The RCT2/OpenRCT2 structures are bigger than in RCT1, so set them to zero
// The RCT2/OpenRCT2 structures are bigger than in RCT1, so initialise them to zero
std::fill(std::begin(gStaffModes), std::end(gStaffModes), StaffMode::None);
std::fill(std::begin(gStaffPatrolAreas), std::end(gStaffPatrolAreas), 0);
std::fill(std::begin(_s4.staff_modes), std::end(_s4.staff_modes), 0);
for (int32_t i = 0; i < RCT1_MAX_STAFF; i++)
{
gStaffModes[i] = static_cast<StaffMode>(_s4.staff_modes[i]);
}
for (auto peep : EntityList<Staff>(EntityListId::Peep))
{