mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 23:33:04 +01:00
Code Issues Releases Wiki Activity

Check if guest action is interruptable

Browse Source 
This fixes a bug where the waving or eating animations for the guests could suddenly reset while it was already playing
This commit is contained in:
matheusvb3
2025-10-06 21:06:25 -03:00
parent 646d16e745
commit 80977e1e0d
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/openrct2/entity/Peep.cpp
View File

@@ -266,21 +266,24 @@ void Peep::UpdateWaitingAtCrossing()
if (auto* guest = As<Guest>(); guest != nullptr) if (auto* guest = As<Guest>(); guest != nullptr)
{ {
if (guest->HasFoodOrDrink()) if (guest->IsActionInterruptable())
{ {
if ((ScenarioRand() & 0xFFFF) <= 1310) if (guest->HasFoodOrDrink())
{ {
Action = PeepActionType::eatFood; if ((ScenarioRand() & 0xFFFF) <= 1310)
{
Action = PeepActionType::eatFood;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
}
}
else if ((ScenarioRand() & 0xFFFF) <= 64)
{
Action = PeepActionType::wave2;
AnimationFrameNum = 0; AnimationFrameNum = 0;
AnimationImageIdOffset = 0; AnimationImageIdOffset = 0;
} }
} }
else if ((ScenarioRand() & 0xFFFF) <= 64)
{
Action = PeepActionType::wave2;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
}
} }
UpdateCurrentAnimationType(); UpdateCurrentAnimationType();