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

Rename PeepActionType None1 and None2

Browse Source
This commit is contained in:
Matt
2021-05-11 09:44:41 +03:00
parent ae66592c2b
commit 4c11e11fe2
7 changed files with 222 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ GameActions::Result::Ptr StaffHireNewAction::QueryExecute(bool execute) const
else
{
newPeep->WindowInvalidateFlags = 0;
newPeep->Action = PeepActionType::None2;
newPeep->Action = PeepActionType::Walking;
newPeep->SpecialSprite = 0;
newPeep->ActionSpriteImageOffset = 0;
newPeep->WalkingFrameNum = 0;

2
src/openrct2/paint/sprite/Paint.Peep.cpp
View File

@@ -69,7 +69,7 @@ template<> void PaintEntity(paint_session* session, const Peep* peep, int32_t im
PeepActionSpriteType actionSpriteType = peep->ActionSpriteType;
uint8_t imageOffset = peep->ActionSpriteImageOffset;
if (peep->Action == PeepActionType::None1)
if (peep->Action == PeepActionType::Idle)
{
actionSpriteType = peep->NextActionSpriteType;
imageOffset = 0;

384
src/openrct2/peep/Guest.cpp
View File

@@ -223,178 +223,178 @@ static struct
} PeepThoughtToActionMap[] = {
{ PeepActionType::ShakeHead, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::EmptyPockets, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ 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::None2, PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_SINGULAR },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_SHOP_ITEM_INDEFINITE },
{ 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::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, 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_NO_FLAGS },
{ PeepActionType::Joy, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::CheckTime, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, 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::Wave, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ 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::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, 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::Disgust, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, 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::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ PeepActionType::None2, 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::None2, PEEP_THOUGHT_ACTION_NO_FLAGS },
{ PeepActionType::None2, 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::None2, PEEP_THOUGHT_ACTION_FLAG_RIDE },
{ 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.
@@ -474,7 +474,7 @@ void Guest::GivePassingPeepsPizza(Guest* passingPeep)
int32_t otherPeepOppositeDirection = passingPeep->sprite_direction >> 3;
if (peepDirection == otherPeepOppositeDirection)
{
if (passingPeep->Action == PeepActionType::None1 || passingPeep->Action == PeepActionType::None2)
if (passingPeep->Action == PeepActionType::Idle || passingPeep->Action == PeepActionType::Walking)
{
passingPeep->Action = PeepActionType::Wave2;
passingPeep->ActionFrame = 0;
@@ -491,7 +491,7 @@ void Guest::MakePassingPeepsSick(Guest* passingPeep)
if (passingPeep->State != PeepState::Walking)
return;
if (passingPeep->Action == PeepActionType::None1 || passingPeep->Action == PeepActionType::None2)
if (passingPeep->Action == PeepActionType::Idle || passingPeep->Action == PeepActionType::Walking)
{
passingPeep->Action = PeepActionType::ThrowUp;
passingPeep->ActionFrame = 0;
@@ -536,7 +536,7 @@ void Guest::UpdateEasterEggInteractions()
{
if (scenario_rand() <= 1456)
{
if (Action == PeepActionType::None1 || Action == PeepActionType::None2)
if (Action == PeepActionType::Idle || Action == PeepActionType::Walking)
{
Action = PeepActionType::Joy;
ActionFrame = 0;
@@ -744,7 +744,7 @@ void Guest::loc_68F9F3()
{
if ((scenario_rand() & 0xFF) <= static_cast<uint8_t>((Nausea - 128) / 2))
{
if (Action >= PeepActionType::None1)
if (Action >= PeepActionType::Idle)
{
Action = PeepActionType::ThrowUp;
ActionFrame = 0;
@@ -1236,7 +1236,7 @@ void Guest::UpdateSitting()
MoveTo(loc);
sprite_direction = ((Var37 + 2) & 3) * 8;
Action = PeepActionType::None1;
Action = PeepActionType::Idle;
NextActionSpriteType = PeepActionSpriteType::SittingIdle;
SwitchNextActionSpriteType();
@@ -1247,13 +1247,13 @@ void Guest::UpdateSitting()
}
else if (SittingSubState == PeepSittingSubState::SatDown)
{
if (Action < PeepActionType::None1)
if (Action < PeepActionType::Idle)
{
UpdateAction();
if (Action != PeepActionType::None2)
if (Action != PeepActionType::Walking)
return;
Action = PeepActionType::None1;
Action = PeepActionType::Idle;
TryGetUpFromSitting();
return;
}
@@ -2341,7 +2341,7 @@ void Guest::ChoseNotToGoOnRide(Ride* ride, bool peepAtRide, bool updateLastRide)
void Guest::ReadMap()
{
if (Action == PeepActionType::None1 || Action == PeepActionType::None2)
if (Action == PeepActionType::Idle || Action == PeepActionType::Walking)
{
Action = PeepActionType::ReadMap;
ActionFrame = 0;
@@ -3290,7 +3290,7 @@ void Guest::UpdateBuying()
if (SubState == 1)
{
if (Action != PeepActionType::None2)
if (Action != PeepActionType::Walking)
{
UpdateAction();
Invalidate();
@@ -4781,7 +4781,7 @@ void Guest::UpdateRideMazePathfinding()
return;
}
if (Action >= PeepActionType::None1)
if (Action >= PeepActionType::Idle)
{
if (Energy > 64 && (scenario_rand() & 0xFFFF) <= 2427)
{
@@ -5174,7 +5174,7 @@ void Guest::UpdateWalking()
if (PeepFlags & PEEP_FLAGS_WAVING)
{
if (Action >= PeepActionType::None1)
if (Action >= PeepActionType::Idle)
{
if ((0xFFFF & scenario_rand()) < 936)
{
@@ -5189,7 +5189,7 @@ void Guest::UpdateWalking()
if (PeepFlags & PEEP_FLAGS_PHOTO)
{
if (Action >= PeepActionType::None1)
if (Action >= PeepActionType::Idle)
{
if ((0xFFFF & scenario_rand()) < 936)
{
@@ -5204,7 +5204,7 @@ void Guest::UpdateWalking()
if (PeepFlags & PEEP_FLAGS_PAINTING)
{
if (Action >= PeepActionType::None1)
if (Action >= PeepActionType::Idle)
{
if ((0xFFFF & scenario_rand()) < 936)
{
@@ -5481,7 +5481,7 @@ void Guest::UpdateQueuing()
uint8_t pathingResult;
PerformNextAction(pathingResult);
if (Action < PeepActionType::None1)
if (Action < PeepActionType::Idle)
return;
if (SpriteType == PeepSpriteType::Normal)
{
@@ -5501,7 +5501,7 @@ void Guest::UpdateQueuing()
}
else
{
if (!(TimeInQueue & 0x3F) && Action == PeepActionType::None1 && NextActionSpriteType == PeepActionSpriteType::WatchRide)
if (!(TimeInQueue & 0x3F) && Action == PeepActionType::Idle && NextActionSpriteType == PeepActionSpriteType::WatchRide)
{
switch (SpriteType)
{
@@ -5638,7 +5638,7 @@ void Guest::UpdateWatching()
sprite_direction = (Var37 & 3) * 8;
Action = PeepActionType::None1;
Action = PeepActionType::Idle;
NextActionSpriteType = PeepActionSpriteType::WatchRide;
SwitchNextActionSpriteType();
@@ -5650,14 +5650,14 @@ void Guest::UpdateWatching()
}
else if (SubState == 1)
{
if (Action < PeepActionType::None1)
if (Action < PeepActionType::Idle)
{
// 6917F6
UpdateAction();
Invalidate();
if (Action != PeepActionType::None2)
if (Action != PeepActionType::Walking)
return;
Action = PeepActionType::None1;
Action = PeepActionType::Idle;
}
else
{
@@ -5736,7 +5736,7 @@ void Guest::UpdateUsingBin()
}
case PeepUsingBinSubState::GoingBack:
{
if (Action != PeepActionType::None2)
if (Action != PeepActionType::Walking)
{
UpdateAction();
Invalidate();
@@ -6592,8 +6592,8 @@ void Guest::SetSpriteType(PeepSpriteType new_sprite_type)
ActionSpriteImageOffset = 0;
WalkingFrameNum = 0;
if (Action >= PeepActionType::None1)
Action = PeepActionType::None2;
if (Action >= PeepActionType::Idle)
Action = PeepActionType::Walking;
PeepFlags &= ~PEEP_FLAGS_SLOW_WALK;
Guard::Assert(EnumValue(new_sprite_type) < std::size(gSpriteTypeToSlowWalkMap));
@@ -6607,13 +6607,13 @@ void Guest::SetSpriteType(PeepSpriteType new_sprite_type)
if (State == PeepState::Sitting)
{
Action = PeepActionType::None1;
Action = PeepActionType::Idle;
NextActionSpriteType = PeepActionSpriteType::SittingIdle;
SwitchNextActionSpriteType();
}
if (State == PeepState::Watching)
{
Action = PeepActionType::None1;
Action = PeepActionType::Idle;
NextActionSpriteType = PeepActionSpriteType::WatchRide;
SwitchNextActionSpriteType();
}
@@ -6803,7 +6803,7 @@ void peep_thought_set_format_args(const rct_peep_thought* thought, Formatter& ft
void Guest::InsertNewThought(PeepThoughtType thoughtType, uint8_t thoughtArguments)
{
PeepActionType newAction = PeepThoughtToActionMap[EnumValue(thoughtType)].action;
if (newAction != PeepActionType::None2 && this->Action >= PeepActionType::None1)
if (newAction != PeepActionType::Walking && this->Action >= PeepActionType::Idle)
{
Action = newAction;
ActionFrame = 0;
@@ -6930,7 +6930,7 @@ Guest* Guest::Generate(const CoordsXYZ& coords)
peep->SpriteType = PeepSpriteType::Normal;
peep->OutsideOfPark = true;
peep->State = PeepState::Falling;
peep->Action = PeepActionType::None2;
peep->Action = PeepActionType::Walking;
peep->SpecialSprite = 0;
peep->ActionSpriteImageOffset = 0;
peep->WalkingFrameNum = 0;
@@ -7270,15 +7270,15 @@ bool Guest::UpdateQueuePosition(PeepActionType previous_action)
}
}
if (Action < PeepActionType::None1)
if (Action < PeepActionType::Idle)
UpdateAction();
if (Action != PeepActionType::None2)
if (Action != PeepActionType::Walking)
return true;
Action = PeepActionType::None1;
Action = PeepActionType::Idle;
NextActionSpriteType = PeepActionSpriteType::WatchRide;
if (previous_action != PeepActionType::None1)
if (previous_action != PeepActionType::Idle)
Invalidate();
return true;
}

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

@@ -307,7 +307,7 @@ bool Peep::CheckForPath()
PeepActionSpriteType Peep::GetActionSpriteType()
{
if (Action >= PeepActionType::None1)
if (Action >= PeepActionType::Idle)
{ // PeepActionType::None1 or PeepActionType::None2
return PeepSpecialSpriteToSpriteTypeMap[SpecialSprite];
}
@@ -318,7 +318,7 @@ PeepActionSpriteType Peep::GetActionSpriteType()
else
{
openrct2_assert(
EnumValue(Action) >= std::size(PeepActionToSpriteTypeMap) && Action < PeepActionType::None1,
EnumValue(Action) >= std::size(PeepActionToSpriteTypeMap) && Action < PeepActionType::Idle,
"Invalid peep action %u", EnumValue(Action));
return PeepActionSpriteType::None;
}
@@ -359,7 +359,7 @@ void Peep::SwitchToSpecialSprite(uint8_t special_sprite_id)
SpecialSprite = special_sprite_id;
// If NONE_1 or NONE_2
if (Action >= PeepActionType::None1)
if (Action >= PeepActionType::Idle)
{
ActionSpriteImageOffset = 0;
}
@@ -392,9 +392,9 @@ std::optional<CoordsXY> Peep::UpdateAction()
std::optional<CoordsXY> Peep::UpdateAction(int16_t& xy_distance)
{
_unk_F1AEF0 = ActionSpriteImageOffset;
if (Action == PeepActionType::None1)
if (Action == PeepActionType::Idle)
{
Action = PeepActionType::None2;
Action = PeepActionType::Walking;
}
CoordsXY differenceLoc = GetLocation();
@@ -405,7 +405,7 @@ std::optional<CoordsXY> Peep::UpdateAction(int16_t& xy_distance)
xy_distance = x_delta + y_delta;
if (Action == PeepActionType::None1 || Action == PeepActionType::None2)
if (Action == PeepActionType::Idle || Action == PeepActionType::Walking)
{
if (xy_distance <= DestinationTolerance)
{
@@ -449,7 +449,7 @@ std::optional<CoordsXY> Peep::UpdateAction(int16_t& xy_distance)
if (ActionFrame >= peepAnimation[EnumValue(ActionSpriteType)].num_frames)
{
ActionSpriteImageOffset = 0;
Action = PeepActionType::None2;
Action = PeepActionType::Walking;
UpdateCurrentActionSpriteType();
return { { x, y } };
}
@@ -557,7 +557,7 @@ void Peep::PickupAbort(int32_t old_x)
if (x != LOCATION_NULL)
{
SetState(PeepState::Falling);
Action = PeepActionType::None2;
Action = PeepActionType::Walking;
SpecialSprite = 0;
ActionSpriteImageOffset = 0;
ActionSpriteType = PeepActionSpriteType::None;
@@ -608,7 +608,7 @@ std::unique_ptr<GameActions::Result> Peep::Place(const TileCoordsXYZ& location,
{
MoveTo(destination);
SetState(PeepState::Falling);
Action = PeepActionType::None2;
Action = PeepActionType::Walking;
SpecialSprite = 0;
ActionSpriteImageOffset = 0;
ActionSpriteType = PeepActionSpriteType::None;
@@ -930,7 +930,7 @@ void Peep::Update()
stepsToTake = 95;
if ((PeepFlags & PEEP_FLAGS_SLOW_WALK) && State != PeepState::Queuing)
stepsToTake /= 2;
if (Action == PeepActionType::None2 && (GetNextIsSloped()))
if (Action == PeepActionType::Walking && (GetNextIsSloped()))
{
stepsToTake /= 2;
if (State == PeepState::Queuing)
@@ -1248,7 +1248,7 @@ void peep_applause()
peep_release_balloon(peep, peep->z + 9);
// Clap
if ((peep->State == PeepState::Walking || peep->State == PeepState::Queuing) && peep->Action >= PeepActionType::None1)
if ((peep->State == PeepState::Walking || peep->State == PeepState::Queuing) && peep->Action >= PeepActionType::Idle)
{
peep->Action = PeepActionType::Clap;
peep->ActionFrame = 0;
@@ -2271,8 +2271,8 @@ void Peep::PerformNextAction(uint8_t& pathing_result, TileElement*& tile_result)
pathing_result = 0;
PeepActionType previousAction = Action;
if (Action == PeepActionType::None1)
Action = PeepActionType::None2;
if (Action == PeepActionType::Idle)
Action = PeepActionType::Walking;
auto* guest = As<Guest>();
if (State == PeepState::Queuing && guest != nullptr)

4
src/openrct2/peep/Peep.h
View File

@@ -314,8 +314,8 @@ enum class PeepActionType : uint8_t
BeingWatched = 29,
WithdrawMoney = 30,
None1 = 254,
None2 = 255,
Idle = 254,
Walking = 255,
};
enum class PeepActionSpriteType : uint8_t

24
src/openrct2/peep/Staff.cpp
View File

@@ -996,7 +996,7 @@ void Staff::EntertainerUpdateNearbyPeeps() const
*/
bool Staff::DoEntertainerPathFinding()
{
if (((scenario_rand() & 0xFFFF) <= 0x4000) && (Action == PeepActionType::None1 || Action == PeepActionType::None2))
if (((scenario_rand() & 0xFFFF) <= 0x4000) && (Action == PeepActionType::Idle || Action == PeepActionType::Walking))
{
Action = (scenario_rand() & 1) ? PeepActionType::Wave2 : PeepActionType::Joy;
ActionFrame = 0;
@@ -1213,7 +1213,7 @@ void Staff::UpdateWatering()
}
else if (SubState == 1)
{
if (Action != PeepActionType::None2)
if (Action != PeepActionType::Walking)
{
UpdateAction();
Invalidate();
@@ -1277,7 +1277,7 @@ void Staff::UpdateEmptyingBin()
}
else if (SubState == 1)
{
if (Action == PeepActionType::None2)
if (Action == PeepActionType::Walking)
{
StateReset();
return;
@@ -1496,7 +1496,7 @@ void Staff::UpdateAnswering()
}
else if (SubState == 1)
{
if (Action == PeepActionType::None2)
if (Action == PeepActionType::Walking)
{
SubState = 2;
peep_window_state_update(this);
@@ -1791,8 +1791,8 @@ void Staff::Tick128UpdateStaff()
SpriteType = newSpriteType;
ActionSpriteImageOffset = 0;
WalkingFrameNum = 0;
if (Action < PeepActionType::None1)
Action = PeepActionType::None2;
if (Action < PeepActionType::Idle)
Action = PeepActionType::Walking;
PeepFlags &= ~PEEP_FLAGS_SLOW_WALK;
if (gSpriteTypeToSlowWalkMap[EnumValue(newSpriteType)])
@@ -2184,7 +2184,7 @@ bool Staff::UpdateFixingFixVehicle(bool firstRun, const Ride* ride)
UpdateCurrentActionSpriteType();
}
if (Action == PeepActionType::None2)
if (Action == PeepActionType::Walking)
{
return true;
}
@@ -2226,7 +2226,7 @@ bool Staff::UpdateFixingFixVehicleMalfunction(bool firstRun, const Ride* ride)
UpdateCurrentActionSpriteType();
}
if (Action == PeepActionType::None2)
if (Action == PeepActionType::Walking)
{
return true;
}
@@ -2331,7 +2331,7 @@ bool Staff::UpdateFixingFixStationEnd(bool firstRun)
UpdateCurrentActionSpriteType();
}
if (Action == PeepActionType::None2)
if (Action == PeepActionType::Walking)
{
return true;
}
@@ -2444,7 +2444,7 @@ bool Staff::UpdateFixingFixStationStart(bool firstRun, const Ride* ride)
UpdateCurrentActionSpriteType();
}
if (Action == PeepActionType::None2)
if (Action == PeepActionType::Walking)
{
return true;
}
@@ -2472,7 +2472,7 @@ bool Staff::UpdateFixingFixStationBrakes(bool firstRun, Ride* ride)
UpdateCurrentActionSpriteType();
}
if (Action == PeepActionType::None2)
if (Action == PeepActionType::Walking)
{
return true;
}
@@ -2564,7 +2564,7 @@ bool Staff::UpdateFixingFinishFixOrInspect(bool firstRun, int32_t steps, Ride* r
UpdateCurrentActionSpriteType();
}
if (Action != PeepActionType::None2)
if (Action != PeepActionType::Walking)
{
UpdateAction();
Invalidate();

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

@@ -199,7 +199,7 @@ static bool map_animation_invalidate_small_scenery(const CoordsXYZ& loc)
continue;
if (peep->z != loc.z)
continue;
if (peep->Action < PeepActionType::None1)
if (peep->Action < PeepActionType::Idle)
continue;
peep->Action = PeepActionType::CheckTime;