mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix #23597: Adjust any staff set to EatFood animation (#23613)

Browse source
This commit is contained in:
Aaron van Geffen 2025-01-13 22:20:06 +01:00 committed by GitHub
parent bc66278686
commit e7eba6b4c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/openrct2/park/Legacy.cpp
View file

@ -2335,6 +2335,21 @@ static bool ConvertPeepAnimationType(TPeepType* peep, AnimObjectConversionTable&
auto& conversion = table[legacyPAG]; auto& conversion = table[legacyPAG];
peep->AnimationObjectIndex = conversion.first; peep->AnimationObjectIndex = conversion.first;
peep->AnimationGroup = static_cast<PeepAnimationGroup>(conversion.second); peep->AnimationGroup = static_cast<PeepAnimationGroup>(conversion.second);
if (!peep->template Is<Staff>())
return true;
// NB: 'EatFood' used to be supported, but turned out to be unused in C++ code.
// Assigned sprites were found to be identical to those of 'Wave2', hence the mapping.
// However, it appears to have been used by JavaScript plugins, still, hence the
// need to convert any existing sprites.
if (peep->AnimationType == PeepAnimationType::EatFood)
peep->AnimationType = PeepAnimationType::Wave2;
// NB: this is likely unnecessary, but a precautionary measure considering the above.
if (peep->NextAnimationType == PeepAnimationType::EatFood)
peep->NextAnimationType = PeepAnimationType::Wave2;
return true; return true;
} }