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

Rename fields of PeepAnimation

Browse Source
This commit is contained in:
Gymnasiast
2025-10-05 01:27:23 +02:00
parent be23fbc98c
commit aa84394e7b
14 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -480,12 +480,12 @@ bool Peep::UpdateActionAnimation()
AnimationFrameNum++;
// If last frame of action
if (AnimationFrameNum >= peepAnimation.frame_offsets.size())
if (AnimationFrameNum >= peepAnimation.frameOffsets.size())
{
return false;
}
AnimationImageIdOffset = peepAnimation.frame_offsets[AnimationFrameNum];
AnimationImageIdOffset = peepAnimation.frameOffsets[AnimationFrameNum];
return true;
}
@@ -539,11 +539,11 @@ void Peep::UpdateWalkingAnimation()
WalkingAnimationFrameNum++;
const PeepAnimation& peepAnimation = animObj->GetPeepAnimation(AnimationGroup, AnimationType);
if (WalkingAnimationFrameNum >= peepAnimation.frame_offsets.size())
if (WalkingAnimationFrameNum >= peepAnimation.frameOffsets.size())
{
WalkingAnimationFrameNum = 0;
}
AnimationImageIdOffset = peepAnimation.frame_offsets[WalkingAnimationFrameNum];
AnimationImageIdOffset = peepAnimation.frameOffsets[WalkingAnimationFrameNum];
}
/**
@@ -2762,7 +2762,7 @@ void Peep::Paint(PaintSession& session, int32_t imageDirection) const
auto& objManager = GetContext()->GetObjectManager();
auto* animObj = objManager.GetLoadedObject<PeepAnimationsObject>(AnimationObjectIndex);
uint32_t baseImageId = animObj->GetPeepAnimation(AnimationGroup, actionAnimationGroup).base_image;
uint32_t baseImageId = animObj->GetPeepAnimation(AnimationGroup, actionAnimationGroup).baseImage;
// Offset frame onto the base image, using rotation except for the 'picked up' state
if (actionAnimationGroup != PeepAnimationType::Hanging)