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

Rename PeepAnimationType::None to PeepAnimationType::Walking (#23317)

Browse Source
This commit is contained in:
Aaron van Geffen
2024-12-04 17:09:17 +01:00
committed by GitHub
parent a55a690db3
commit f65ef67260
11 changed files with 164 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ static std::shared_ptr<IAudioChannel> _crowdSoundChannel = nullptr;
static void GuestReleaseBalloon(Guest* peep, int16_t spawn_height);
static PeepAnimationType PeepSpecialSpriteToAnimationGroupMap[] = {
PeepAnimationType::None,
PeepAnimationType::Walking,
PeepAnimationType::HoldMat,
PeepAnimationType::StaffMower,
};
@@ -332,7 +332,7 @@ PeepAnimationType Peep::GetAnimationType()
Guard::Assert(
EnumValue(Action) >= std::size(PeepActionToAnimationGroupMap) && Action < PeepActionType::Idle,
"Invalid peep action %u", EnumValue(Action));
return PeepAnimationType::None;
return PeepAnimationType::Walking;
}
/*
@@ -625,7 +625,7 @@ void Peep::PickupAbort(int32_t old_x)
Action = PeepActionType::Walking;
SpecialSprite = 0;
AnimationImageIdOffset = 0;
AnimationType = PeepAnimationType::None;
AnimationType = PeepAnimationType::Walking;
PathCheckOptimisation = 0;
}
@@ -674,7 +674,7 @@ GameActions::Result Peep::Place(const TileCoordsXYZ& location, bool apply)
Action = PeepActionType::Walking;
SpecialSprite = 0;
AnimationImageIdOffset = 0;
AnimationType = PeepAnimationType::None;
AnimationType = PeepAnimationType::Walking;
PathCheckOptimisation = 0;
EntityTweener::Get().Reset();
auto* guest = As<Guest>();
@@ -2911,7 +2911,7 @@ void Peep::Paint(PaintSession& session, int32_t imageDirection) const
return;
}
if (baseImageId >= kPeepSpriteUmbrellaStateNoneId && baseImageId < (kPeepSpriteUmbrellaStateSittingIdleId + 4))
if (baseImageId >= kPeepSpriteUmbrellaStateWalkingId && baseImageId < (kPeepSpriteUmbrellaStateSittingIdleId + 4))
{
imageId = ImageId(baseImageId + 32, guest->UmbrellaColour);
PaintAddImageAsChild(session, imageId, offset, bb);