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

Rename members of PeepActionType

Browse Source
This commit is contained in:
Gymnasiast
2025-10-05 01:31:19 +02:00
parent e3204c95e6
commit 0cb04754fb
7 changed files with 278 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/actions/StaffHireNewAction.cpp
View File

@@ -115,7 +115,7 @@ namespace OpenRCT2::GameActions
else
{
newPeep->WindowInvalidateFlags = 0;
newPeep->Action = PeepActionType::Walking;
newPeep->Action = PeepActionType::walking;
newPeep->SpecialSprite = 0;
newPeep->AnimationImageIdOffset = 0;
newPeep->WalkingAnimationFrameNum = 0;

414
src/openrct2/entity/Guest.cpp
View File

@@ -260,180 +260,180 @@ static struct
PeepActionType action;
PeepThoughtToActionFlag flags;
} PeepThoughtToActionMap[] = {
{ PeepActionType::ShakeHead, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::EmptyPockets, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Wow, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_SINGULAR },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_INDEFINITE },
{ PeepActionType::ShakeHead, PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_INDEFINITE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Wave, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Joy, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::CheckTime, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Wave, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Wave, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Disgust, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::BeingWatched, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::ShakeHead, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Joy, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::Walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::shakeHead, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::emptyPockets, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::wow, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_SINGULAR },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_INDEFINITE },
{ PeepActionType::shakeHead, PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_INDEFINITE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::wave, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::joy, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::checkTime, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::wave, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::wave, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::disgust, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::beingWatched, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::shakeHead, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::joy, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::walking, PEEP_THOUGHT_ACTION_FLAG_RIDE },
};
// These arrays contain the base minimum and maximum nausea ratings for peeps, based on their nausea tolerance level.
@@ -534,7 +534,7 @@ void Guest::GivePassingGuestPizza(Guest& passingPeep)
{
if (passingPeep.IsActionInterruptableSafely())
{
passingPeep.Action = PeepActionType::Wave2;
passingPeep.Action = PeepActionType::wave2;
passingPeep.AnimationFrameNum = 0;
passingPeep.AnimationImageIdOffset = 0;
passingPeep.UpdateCurrentAnimationType();
@@ -549,7 +549,7 @@ void Guest::MakePassingGuestSick(Guest& passingPeep)
if (passingPeep.IsActionInterruptableSafely())
{
passingPeep.Action = PeepActionType::ThrowUp;
passingPeep.Action = PeepActionType::throwUp;
passingPeep.AnimationFrameNum = 0;
passingPeep.AnimationImageIdOffset = 0;
passingPeep.UpdateCurrentAnimationType();
@@ -597,7 +597,7 @@ void Guest::UpdateEasterEggInteractions()
{
if (IsActionInterruptableSafely())
{
Action = PeepActionType::Joy;
Action = PeepActionType::joy;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
UpdateCurrentAnimationType();
@@ -802,7 +802,7 @@ void Guest::UpdateMotivesIdle()
{
if (IsActionInterruptableSafely())
{
Action = PeepActionType::ThrowUp;
Action = PeepActionType::throwUp;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
UpdateCurrentAnimationType();
@@ -1298,7 +1298,7 @@ void Guest::UpdateSitting()
MoveTo(loc);
Orientation = ((Var37 + 2) & 3) * 8;
Action = PeepActionType::Idle;
Action = PeepActionType::idle;
NextAnimationType = PeepAnimationType::SittingIdle;
SwitchNextAnimationType();
@@ -1315,7 +1315,7 @@ void Guest::UpdateSitting()
if (!IsActionWalking())
return;
Action = PeepActionType::Idle;
Action = PeepActionType::idle;
GuestTryGetUpFromSitting(*this);
return;
}
@@ -1344,7 +1344,7 @@ void Guest::UpdateSitting()
GuestTryGetUpFromSitting(*this);
return;
}
Action = PeepActionType::SittingEatFood;
Action = PeepActionType::sittingEatFood;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
UpdateCurrentAnimationType();
@@ -1363,15 +1363,15 @@ void Guest::UpdateSitting()
return;
}
Action = PeepActionType::SittingLookAroundLeft;
Action = PeepActionType::sittingLookAroundLeft;
if (rand & 0x80000000u)
{
Action = PeepActionType::SittingLookAroundRight;
Action = PeepActionType::sittingLookAroundRight;
}
if (rand & 0x40000000u)
{
Action = PeepActionType::SittingCheckWatch;
Action = PeepActionType::sittingCheckWatch;
}
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
@@ -2428,7 +2428,7 @@ void Guest::ReadMap()
{
if (IsActionInterruptableSafely())
{
Action = PeepActionType::ReadMap;
Action = PeepActionType::readMap;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
UpdateCurrentAnimationType();
@@ -3435,7 +3435,7 @@ void Guest::UpdateBuying()
}
else
{
Action = PeepActionType::WithdrawMoney;
Action = PeepActionType::withdrawMoney;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
@@ -4961,7 +4961,7 @@ void Guest::UpdateRideMazePathfinding()
if (Energy > 80 && !(PeepFlags & PEEP_FLAGS_SLOW_WALK) && !ClimateIsPrecipitating()
&& (ScenarioRand() & 0xFFFF) <= 2427)
{
Action = PeepActionType::Jump;
Action = PeepActionType::jump;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
UpdateCurrentAnimationType();
@@ -5478,11 +5478,11 @@ void Guest::UpdateWalking()
PeepActionType NewAction = Action;
if (PeepFlags & PEEP_FLAGS_WAVING && (0xFFFF & ScenarioRand()) < 936)
NewAction = PeepActionType::Wave2;
NewAction = PeepActionType::wave2;
else if (PeepFlags & PEEP_FLAGS_PHOTO && (0xFFFF & ScenarioRand()) < 936)
NewAction = PeepActionType::TakePhoto;
NewAction = PeepActionType::takePhoto;
else if (PeepFlags & PEEP_FLAGS_PAINTING && (0xFFFF & ScenarioRand()) < 936)
NewAction = PeepActionType::DrawPicture;
NewAction = PeepActionType::drawPicture;
if (NewAction != Action)
{
@@ -5708,7 +5708,7 @@ void Guest::UpdateWaitingAtCrossing()
return;
}
Action = PeepActionType::Idle;
Action = PeepActionType::idle;
NextAnimationType = PeepAnimationType::WatchRide;
SwitchNextAnimationType();
@@ -5716,7 +5716,7 @@ void Guest::UpdateWaitingAtCrossing()
{
if ((ScenarioRand() & 0xFFFF) <= 1310)
{
Action = PeepActionType::EatFood;
Action = PeepActionType::eatFood;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
}
@@ -5728,7 +5728,7 @@ void Guest::UpdateWaitingAtCrossing()
if ((ScenarioRand() & 0xFFFF) <= 64)
{
Action = PeepActionType::Wave2;
Action = PeepActionType::wave2;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
}
@@ -5792,7 +5792,7 @@ void Guest::UpdateQueuing()
if (TimeInQueue >= 2000 && (0xFFFF & ScenarioRand()) <= 119)
{
// Eat Food/Look at watch
Action = PeepActionType::EatFood;
Action = PeepActionType::eatFood;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
UpdateCurrentAnimationType();
@@ -5832,7 +5832,7 @@ void Guest::UpdateQueuing()
case PeepAnimationGroup::Soup:
case PeepAnimationGroup::Sandwich:
// Eat food
Action = PeepActionType::EatFood;
Action = PeepActionType::eatFood;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
UpdateCurrentAnimationType();
@@ -5941,7 +5941,7 @@ void Guest::UpdateWatching()
Orientation = (Var37 & 3) * 8;
Action = PeepActionType::Idle;
Action = PeepActionType::idle;
NextAnimationType = PeepAnimationType::WatchRide;
SwitchNextAnimationType();
@@ -5960,7 +5960,7 @@ void Guest::UpdateWatching()
Invalidate();
if (!IsActionWalking())
return;
Action = PeepActionType::Idle;
Action = PeepActionType::idle;
}
else
{
@@ -5968,7 +5968,7 @@ void Guest::UpdateWatching()
{
if ((ScenarioRand() & 0xFFFF) <= 1310)
{
Action = PeepActionType::EatFood;
Action = PeepActionType::eatFood;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
UpdateCurrentAnimationType();
@@ -5978,7 +5978,7 @@ void Guest::UpdateWatching()
if ((ScenarioRand() & 0xFFFF) <= 655)
{
Action = PeepActionType::TakePhoto;
Action = PeepActionType::takePhoto;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
UpdateCurrentAnimationType();
@@ -5989,7 +5989,7 @@ void Guest::UpdateWatching()
{
if ((ScenarioRand() & 0xFFFF) <= 655)
{
Action = PeepActionType::Wave;
Action = PeepActionType::wave;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
UpdateCurrentAnimationType();
@@ -6893,7 +6893,7 @@ void Guest::SetAnimationGroup(PeepAnimationGroup new_sprite_type)
WalkingAnimationFrameNum = 0;
if (IsActionInterruptable())
Action = PeepActionType::Walking;
Action = PeepActionType::walking;
auto& objManager = GetContext()->GetObjectManager();
auto* animObj = objManager.GetLoadedObject<PeepAnimationsObject>(AnimationObjectIndex);
@@ -6909,13 +6909,13 @@ void Guest::SetAnimationGroup(PeepAnimationGroup new_sprite_type)
if (State == PeepState::sitting)
{
Action = PeepActionType::Idle;
Action = PeepActionType::idle;
NextAnimationType = PeepAnimationType::SittingIdle;
SwitchNextAnimationType();
}
if (State == PeepState::watching)
{
Action = PeepActionType::Idle;
Action = PeepActionType::idle;
NextAnimationType = PeepAnimationType::WatchRide;
SwitchNextAnimationType();
}
@@ -7119,7 +7119,7 @@ void Guest::InsertNewThought(PeepThoughtType thought_type, RideId rideId)
void Guest::InsertNewThought(PeepThoughtType thoughtType, uint16_t thoughtArguments)
{
PeepActionType newAction = PeepThoughtToActionMap[EnumValue(thoughtType)].action;
if (newAction != PeepActionType::Walking && IsActionInterruptableSafely())
if (newAction != PeepActionType::walking && IsActionInterruptableSafely())
{
Action = newAction;
AnimationFrameNum = 0;
@@ -7276,7 +7276,7 @@ Guest* Guest::Generate(const CoordsXYZ& coords)
peep->AnimationGroup = PeepAnimationGroup::Normal;
peep->OutsideOfPark = true;
peep->State = PeepState::falling;
peep->Action = PeepActionType::Walking;
peep->Action = PeepActionType::walking;
peep->SpecialSprite = 0;
peep->AnimationImageIdOffset = 0;
peep->WalkingAnimationFrameNum = 0;
@@ -7624,9 +7624,9 @@ bool Guest::UpdateQueuePosition(PeepActionType previous_action)
if (!IsActionWalking())
return true;
Action = PeepActionType::Idle;
Action = PeepActionType::idle;
NextAnimationType = PeepAnimationType::WatchRide;
if (previous_action != PeepActionType::Idle)
if (previous_action != PeepActionType::idle)
Invalidate();
return true;
}

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

@@ -340,7 +340,7 @@ bool Peep::IsOnPathBlockedByVehicle() const
PeepAnimationType Peep::GetAnimationType()
{
if (IsActionInterruptable())
{ // PeepActionType::None1 or PeepActionType::None2
{ // PeepActionType::none1 or PeepActionType::none2
return PeepSpecialSpriteToAnimationGroupMap[SpecialSprite];
}
@@ -350,7 +350,7 @@ PeepAnimationType Peep::GetAnimationType()
}
Guard::Assert(
EnumValue(Action) >= std::size(PeepActionToAnimationGroupMap) && Action < PeepActionType::Idle,
EnumValue(Action) >= std::size(PeepActionToAnimationGroupMap) && Action < PeepActionType::idle,
"Invalid peep action %u", EnumValue(Action));
return PeepAnimationType::Walking;
}
@@ -432,9 +432,9 @@ std::optional<CoordsXY> Peep::UpdateAction(int16_t& xy_distance)
PROFILED_FUNCTION();
_backupAnimationImageIdOffset = AnimationImageIdOffset;
if (Action == PeepActionType::Idle)
if (Action == PeepActionType::idle)
{
Action = PeepActionType::Walking;
Action = PeepActionType::walking;
}
CoordsXY differenceLoc = GetLocation();
@@ -454,7 +454,7 @@ std::optional<CoordsXY> Peep::UpdateAction(int16_t& xy_distance)
if (!UpdateActionAnimation())
{
AnimationImageIdOffset = 0;
Action = PeepActionType::Walking;
Action = PeepActionType::walking;
UpdateCurrentAnimationType();
return { { x, y } };
}
@@ -462,7 +462,7 @@ std::optional<CoordsXY> Peep::UpdateAction(int16_t& xy_distance)
// Should we throw up, and are we at the frame where sick appears?
if (auto* guest = As<Guest>(); guest != nullptr)
{
if (Action == PeepActionType::ThrowUp && AnimationFrameNum == 15)
if (Action == PeepActionType::throwUp && AnimationFrameNum == 15)
{
guest->ThrowUp();
}
@@ -618,7 +618,7 @@ void Peep::PickupAbort(int32_t old_x)
if (x != kLocationNull)
{
SetState(PeepState::falling);
Action = PeepActionType::Walking;
Action = PeepActionType::walking;
SpecialSprite = 0;
AnimationImageIdOffset = 0;
AnimationType = PeepAnimationType::Walking;
@@ -667,7 +667,7 @@ GameActions::Result Peep::Place(const TileCoordsXYZ& location, bool apply)
{
MoveTo(destination);
SetState(PeepState::falling);
Action = PeepActionType::Walking;
Action = PeepActionType::walking;
SpecialSprite = 0;
AnimationImageIdOffset = 0;
AnimationType = PeepAnimationType::Walking;
@@ -749,12 +749,12 @@ void Peep::Remove()
*/
void Peep::UpdateFalling()
{
if (Action == PeepActionType::Drowning)
if (Action == PeepActionType::drowning)
{
// Check to see if we are ready to drown.
UpdateAction();
Invalidate();
if (Action == PeepActionType::Drowning)
if (Action == PeepActionType::drowning)
return;
if (Config::Get().notifications.GuestDied)
@@ -812,7 +812,7 @@ void Peep::UpdateFalling()
guest->InsertNewThought(PeepThoughtType::Drowning);
}
Action = PeepActionType::Drowning;
Action = PeepActionType::drowning;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
@@ -1231,7 +1231,7 @@ void PeepApplause()
// Clap
if ((peep->State == PeepState::walking || peep->State == PeepState::queuing) && peep->IsActionInterruptableSafely())
{
peep->Action = PeepActionType::Clap;
peep->Action = PeepActionType::clap;
peep->AnimationFrameNum = 0;
peep->AnimationImageIdOffset = 0;
peep->UpdateCurrentAnimationType();
@@ -1265,7 +1265,7 @@ void Peep::FormatActionTo(Formatter& ft) const
switch (State)
{
case PeepState::falling:
ft.Add<StringId>(Action == PeepActionType::Drowning ? STR_DROWNING : STR_WALKING);
ft.Add<StringId>(Action == PeepActionType::drowning ? STR_DROWNING : STR_WALKING);
break;
case PeepState::one:
ft.Add<StringId>(STR_WALKING);
@@ -1520,12 +1520,12 @@ bool Peep::SetName(std::string_view value)
bool Peep::IsActionWalking() const
{
return Action == PeepActionType::Walking;
return Action == PeepActionType::walking;
}
bool Peep::IsActionIdle() const
{
return Action == PeepActionType::Idle;
return Action == PeepActionType::idle;
}
bool Peep::IsActionInterruptable() const
@@ -2309,8 +2309,8 @@ std::pair<uint8_t, TileElement*> Peep::PerformNextAction()
PeepActionType previousAction = Action;
if (Action == PeepActionType::Idle)
Action = PeepActionType::Walking;
if (Action == PeepActionType::idle)
Action = PeepActionType::walking;
auto* guest = As<Guest>();
if (State == PeepState::queuing && guest != nullptr)
@@ -2753,7 +2753,7 @@ void Peep::Paint(PaintSession& session, int32_t imageDirection) const
PeepAnimationType actionAnimationGroup = AnimationType;
uint8_t imageOffset = AnimationImageIdOffset;
if (Action == PeepActionType::Idle)
if (Action == PeepActionType::idle)
{
actionAnimationGroup = NextAnimationType;
imageOffset = 0;
@@ -2783,7 +2783,7 @@ void Peep::Paint(PaintSession& session, int32_t imageDirection) const
return;
// Can't display any accessories whilst drowning or clapping
if (Action == PeepActionType::Drowning || Action == PeepActionType::Clap)
if (Action == PeepActionType::drowning || Action == PeepActionType::clap)
return;
// There are only 6 walking frames available for each item,

68
src/openrct2/entity/Peep.h
View File

@@ -109,42 +109,42 @@ enum class PeepUsingBinSubState : uint8_t
enum class PeepActionType : uint8_t
{
CheckTime = 0,
checkTime = 0,
// If no food then check watch
EatFood = 1,
ShakeHead = 2,
EmptyPockets = 3,
SittingEatFood = 4,
SittingCheckWatch = 4,
SittingLookAroundLeft = 5,
SittingLookAroundRight = 6,
Wow = 7,
ThrowUp = 8,
Jump = 9,
StaffSweep = 10,
Drowning = 11,
StaffAnswerCall = 12,
StaffAnswerCall2 = 13,
StaffCheckBoard = 14,
StaffFix = 15,
StaffFix2 = 16,
StaffFixGround = 17,
StaffFix3 = 18,
StaffWatering = 19,
Joy = 20,
ReadMap = 21,
Wave = 22,
StaffEmptyBin = 23,
Wave2 = 24,
TakePhoto = 25,
Clap = 26,
Disgust = 27,
DrawPicture = 28,
BeingWatched = 29,
WithdrawMoney = 30,
eatFood = 1,
shakeHead = 2,
emptyPockets = 3,
sittingEatFood = 4,
sittingCheckWatch = 4,
sittingLookAroundLeft = 5,
sittingLookAroundRight = 6,
wow = 7,
throwUp = 8,
jump = 9,
staffSweep = 10,
drowning = 11,
staffAnswerCall = 12,
staffAnswerCall2 = 13,
staffCheckBoard = 14,
staffFix = 15,
staffFix2 = 16,
staffFixGround = 17,
staffFix3 = 18,
staffWatering = 19,
joy = 20,
readMap = 21,
wave = 22,
staffEmptyBin = 23,
wave2 = 24,
takePhoto = 25,
clap = 26,
disgust = 27,
drawPicture = 28,
beingWatched = 29,
withdrawMoney = 30,
Idle = 254,
Walking = 255,
idle = 254,
walking = 255,
};
enum class PeepAnimationType : uint8_t

30
src/openrct2/entity/Staff.cpp
View File

@@ -926,7 +926,7 @@ bool Staff::DoEntertainerPathFinding()
{
if (((ScenarioRand() & 0xFFFF) <= 0x4000) && IsActionInterruptableSafely())
{
Action = (ScenarioRand() & 1) ? PeepActionType::Wave2 : PeepActionType::Joy;
Action = (ScenarioRand() & 1) ? PeepActionType::wave2 : PeepActionType::joy;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
@@ -1080,7 +1080,7 @@ void Staff::UpdateWatering()
return;
Orientation = (Var37 & 3) << 3;
Action = PeepActionType::StaffWatering;
Action = PeepActionType::staffWatering;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
UpdateCurrentAnimationType();
@@ -1143,7 +1143,7 @@ void Staff::UpdateEmptyingBin()
return;
Orientation = (Var37 & 3) << 3;
Action = PeepActionType::StaffEmptyBin;
Action = PeepActionType::staffEmptyBin;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
UpdateCurrentAnimationType();
@@ -1215,7 +1215,7 @@ void Staff::UpdateSweeping()
if (!CheckForPath())
return;
if (Action == PeepActionType::StaffSweep && AnimationFrameNum == 8)
if (Action == PeepActionType::staffSweep && AnimationFrameNum == 8)
{
// Remove sick at this location
Litter::RemoveAt(GetLocation());
@@ -1232,7 +1232,7 @@ void Staff::UpdateSweeping()
Var37++;
if (Var37 != 2)
{
Action = PeepActionType::StaffSweep;
Action = PeepActionType::staffSweep;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
UpdateCurrentAnimationType();
@@ -1357,7 +1357,7 @@ void Staff::UpdateAnswering()
if (SubState == 0)
{
Action = PeepActionType::StaffAnswerCall;
Action = PeepActionType::staffAnswerCall;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
@@ -1706,8 +1706,8 @@ void Staff::Tick128UpdateStaff()
AnimationGroup = newAnimationGroup;
AnimationImageIdOffset = 0;
WalkingAnimationFrameNum = 0;
if (Action < PeepActionType::Idle)
Action = PeepActionType::Walking;
if (Action < PeepActionType::idle)
Action = PeepActionType::walking;
auto& objManager = GetContext()->GetObjectManager();
auto* animObj = objManager.GetLoadedObject<PeepAnimationsObject>(AnimationObjectIndex);
@@ -2153,7 +2153,7 @@ bool Staff::UpdateFixingFixVehicle(bool firstRun, const Ride& ride)
{
Orientation = PeepDirection << 3;
Action = (ScenarioRand() & 1) ? PeepActionType::StaffFix2 : PeepActionType::StaffFix;
Action = (ScenarioRand() & 1) ? PeepActionType::staffFix2 : PeepActionType::staffFix;
AnimationImageIdOffset = 0;
AnimationFrameNum = 0;
UpdateCurrentAnimationType();
@@ -2167,7 +2167,7 @@ bool Staff::UpdateFixingFixVehicle(bool firstRun, const Ride& ride)
UpdateAction();
Invalidate();
uint8_t actionFrame = (Action == PeepActionType::StaffFix) ? 0x25 : 0x50;
uint8_t actionFrame = (Action == PeepActionType::staffFix) ? 0x25 : 0x50;
if (AnimationFrameNum != actionFrame)
{
return false;
@@ -2194,7 +2194,7 @@ bool Staff::UpdateFixingFixVehicleMalfunction(bool firstRun, const Ride& ride)
if (!firstRun)
{
Orientation = PeepDirection << 3;
Action = PeepActionType::StaffFix3;
Action = PeepActionType::staffFix3;
AnimationImageIdOffset = 0;
AnimationFrameNum = 0;
@@ -2300,7 +2300,7 @@ bool Staff::UpdateFixingFixStationEnd(bool firstRun)
if (!firstRun)
{
Orientation = PeepDirection << 3;
Action = PeepActionType::StaffCheckBoard;
Action = PeepActionType::staffCheckBoard;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
@@ -2415,7 +2415,7 @@ bool Staff::UpdateFixingFixStationStart(bool firstRun, const Ride& ride)
Orientation = PeepDirection << 3;
Action = PeepActionType::StaffFix;
Action = PeepActionType::staffFix;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
@@ -2443,7 +2443,7 @@ bool Staff::UpdateFixingFixStationBrakes(bool firstRun, Ride& ride)
{
Orientation = PeepDirection << 3;
Action = PeepActionType::StaffFixGround;
Action = PeepActionType::staffFixGround;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;
@@ -2534,7 +2534,7 @@ bool Staff::UpdateFixingFinishFixOrInspect(bool firstRun, int32_t steps, Ride& r
WindowInvalidateFlags |= RIDE_INVALIDATE_RIDE_INCOME | RIDE_INVALIDATE_RIDE_LIST;
Orientation = PeepDirection << 3;
Action = PeepActionType::StaffAnswerCall2;
Action = PeepActionType::staffAnswerCall2;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;

2
src/openrct2/scripting/bindings/entity/ScStaff.cpp
View File

@@ -101,7 +101,7 @@ namespace OpenRCT2::Scripting
}
// Reset state to walking to prevent invalid actions from carrying over
peep->Action = PeepActionType::Walking;
peep->Action = PeepActionType::walking;
peep->AnimationType = peep->NextAnimationType = PeepAnimationType::Walking;
peep->Invalidate();
}

2
src/openrct2/world/MapAnimation.cpp
View File

@@ -178,7 +178,7 @@ static std::optional<UpdateType> UpdateSmallSceneryAnimation(
{
if (peep->State != PeepState::walking || peep->z != baseZ || !peep->IsActionInterruptableSafely())
continue;
peep->Action = PeepActionType::CheckTime;
peep->Action = PeepActionType::checkTime;
peep->AnimationFrameNum = 0;
peep->AnimationImageIdOffset = 0;
peep->UpdateCurrentAnimationType();