diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 83a6df4d6d..aa597ec132 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -283,7 +283,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots COMPARE_FIELD(Peep, SpecialSprite); COMPARE_FIELD(Peep, AnimationType); COMPARE_FIELD(Peep, NextAnimationType); - COMPARE_FIELD(Peep, ActionSpriteImageOffset); + COMPARE_FIELD(Peep, AnimationImageIdOffset); COMPARE_FIELD(Peep, Action); COMPARE_FIELD(Peep, AnimationFrameNum); COMPARE_FIELD(Peep, StepProgress); diff --git a/src/openrct2/actions/StaffHireNewAction.cpp b/src/openrct2/actions/StaffHireNewAction.cpp index c53e021486..e6352f9260 100644 --- a/src/openrct2/actions/StaffHireNewAction.cpp +++ b/src/openrct2/actions/StaffHireNewAction.cpp @@ -132,7 +132,7 @@ GameActions::Result StaffHireNewAction::QueryExecute(bool execute) const newPeep->WindowInvalidateFlags = 0; newPeep->Action = PeepActionType::Walking; newPeep->SpecialSprite = 0; - newPeep->ActionSpriteImageOffset = 0; + newPeep->AnimationImageIdOffset = 0; newPeep->WalkingAnimationFrameNum = 0; newPeep->AnimationType = PeepAnimationType::None; newPeep->PathCheckOptimisation = 0; diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index bf5a459ad1..dba57fd5f9 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -513,7 +513,7 @@ void Guest::GivePassingPeepsPizza(Guest* passingPeep) { passingPeep->Action = PeepActionType::Wave2; passingPeep->AnimationFrameNum = 0; - passingPeep->ActionSpriteImageOffset = 0; + passingPeep->AnimationImageIdOffset = 0; passingPeep->UpdateCurrentAnimationType(); } } @@ -528,7 +528,7 @@ void Guest::MakePassingPeepsSick(Guest* passingPeep) { passingPeep->Action = PeepActionType::ThrowUp; passingPeep->AnimationFrameNum = 0; - passingPeep->ActionSpriteImageOffset = 0; + passingPeep->AnimationImageIdOffset = 0; passingPeep->UpdateCurrentAnimationType(); } } @@ -576,7 +576,7 @@ void Guest::UpdateEasterEggInteractions() { Action = PeepActionType::Joy; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); } } @@ -781,7 +781,7 @@ void Guest::UpdateMotivesIdle() { Action = PeepActionType::ThrowUp; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); } } @@ -1323,7 +1323,7 @@ void Guest::UpdateSitting() } Action = PeepActionType::SittingEatFood; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); return; } @@ -1351,7 +1351,7 @@ void Guest::UpdateSitting() Action = PeepActionType::SittingCheckWatch; } AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); return; } @@ -2399,7 +2399,7 @@ void Guest::ReadMap() { Action = PeepActionType::ReadMap; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); } } @@ -3392,7 +3392,7 @@ void Guest::UpdateBuying() { Action = PeepActionType::WithdrawMoney; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); @@ -4138,11 +4138,11 @@ void Guest::UpdateRideLeaveVehicle() return; } - ActionSpriteImageOffset++; - if (ActionSpriteImageOffset & 3) + AnimationImageIdOffset++; + if (AnimationImageIdOffset & 3) return; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; vehicle->num_peeps--; vehicle->ApplyMass(-Mass); @@ -4912,7 +4912,7 @@ void Guest::UpdateRideMazePathfinding() { Action = PeepActionType::Jump; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); } } @@ -5312,7 +5312,7 @@ void Guest::UpdateWalking() { Action = PeepActionType::Wave2; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); } @@ -5321,7 +5321,7 @@ void Guest::UpdateWalking() { Action = PeepActionType::TakePhoto; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); } @@ -5330,7 +5330,7 @@ void Guest::UpdateWalking() { Action = PeepActionType::DrawPicture; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); } @@ -5562,7 +5562,7 @@ void Guest::UpdateWaitingAtCrossing() { Action = PeepActionType::EatFood; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; } UpdateCurrentAnimationType(); @@ -5574,7 +5574,7 @@ void Guest::UpdateWaitingAtCrossing() { Action = PeepActionType::Wave2; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; } UpdateCurrentAnimationType(); @@ -5639,7 +5639,7 @@ void Guest::UpdateQueuing() // Eat Food/Look at watch Action = PeepActionType::EatFood; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); } if (TimeInQueue >= 3500 && (0xFFFF & ScenarioRand()) <= 93) @@ -5679,7 +5679,7 @@ void Guest::UpdateQueuing() // Eat food Action = PeepActionType::EatFood; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); break; default: @@ -5816,7 +5816,7 @@ void Guest::UpdateWatching() { Action = PeepActionType::EatFood; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); return; } @@ -5826,7 +5826,7 @@ void Guest::UpdateWatching() { Action = PeepActionType::TakePhoto; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); return; } @@ -5837,7 +5837,7 @@ void Guest::UpdateWatching() { Action = PeepActionType::Wave; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); return; } @@ -6738,7 +6738,7 @@ void Guest::SetSpriteType(PeepSpriteType new_sprite_type) return; SpriteType = new_sprite_type; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; WalkingAnimationFrameNum = 0; if (IsActionInterruptable()) @@ -6971,7 +6971,7 @@ void Guest::InsertNewThought(PeepThoughtType thoughtType, uint16_t thoughtArgume { Action = newAction; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); } @@ -7124,7 +7124,7 @@ Guest* Guest::Generate(const CoordsXYZ& coords) peep->State = PeepState::Falling; peep->Action = PeepActionType::Walking; peep->SpecialSprite = 0; - peep->ActionSpriteImageOffset = 0; + peep->AnimationImageIdOffset = 0; peep->WalkingAnimationFrameNum = 0; peep->AnimationType = PeepAnimationType::None; peep->PeepFlags = 0; diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 77bfcb8748..81429285a6 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -70,7 +70,7 @@ using namespace OpenRCT2; using namespace OpenRCT2::Audio; -static uint8_t _backupActionSpriteImageOffset; +static uint8_t _backupAnimationImageIdOffset; static TileElement* _peepRideEntranceExitElement; static std::shared_ptr _crowdSoundChannel = nullptr; @@ -374,7 +374,7 @@ void Peep::SwitchToSpecialSprite(uint8_t special_sprite_id) if (IsActionInterruptable()) { - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; } UpdateCurrentAnimationType(); } @@ -411,7 +411,7 @@ std::optional Peep::UpdateAction(int16_t& xy_distance) { PROFILED_FUNCTION(); - _backupActionSpriteImageOffset = ActionSpriteImageOffset; + _backupAnimationImageIdOffset = AnimationImageIdOffset; if (Action == PeepActionType::Idle) { Action = PeepActionType::Walking; @@ -433,7 +433,7 @@ std::optional Peep::UpdateAction(int16_t& xy_distance) if (!UpdateActionAnimation()) { - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; Action = PeepActionType::Walking; UpdateCurrentAnimationType(); return { { x, y } }; @@ -460,7 +460,7 @@ bool Peep::UpdateActionAnimation() return false; } - ActionSpriteImageOffset = peepAnimation.frame_offsets[AnimationFrameNum]; + AnimationImageIdOffset = peepAnimation.frame_offsets[AnimationFrameNum]; return true; } @@ -515,7 +515,7 @@ void Peep::UpdateWalkingAnimation() { WalkingAnimationFrameNum = 0; } - ActionSpriteImageOffset = peepAnimation.frame_offsets[WalkingAnimationFrameNum]; + AnimationImageIdOffset = peepAnimation.frame_offsets[WalkingAnimationFrameNum]; } void Peep::ThrowUp() @@ -621,7 +621,7 @@ void Peep::PickupAbort(int32_t old_x) SetState(PeepState::Falling); Action = PeepActionType::Walking; SpecialSprite = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; AnimationType = PeepAnimationType::None; PathCheckOptimisation = 0; } @@ -670,7 +670,7 @@ GameActions::Result Peep::Place(const TileCoordsXYZ& location, bool apply) SetState(PeepState::Falling); Action = PeepActionType::Walking; SpecialSprite = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; AnimationType = PeepAnimationType::None; PathCheckOptimisation = 0; EntityTweener::Get().Reset(); @@ -817,7 +817,7 @@ void Peep::UpdateFalling() Action = PeepActionType::Drowning; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); PeepWindowStateUpdate(this); @@ -1382,7 +1382,7 @@ void PeepApplause() { peep->Action = PeepActionType::Clap; peep->AnimationFrameNum = 0; - peep->ActionSpriteImageOffset = 0; + peep->AnimationImageIdOffset = 0; peep->UpdateCurrentAnimationType(); } } @@ -1790,7 +1790,7 @@ static bool PeepInteractWithEntrance(Peep* peep, const CoordsXYE& coords, uint8_ { // Guest is in the ride queue. guest->RideSubState = PeepRideSubState::AtQueueFront; - guest->ActionSpriteImageOffset = _backupActionSpriteImageOffset; + guest->AnimationImageIdOffset = _backupAnimationImageIdOffset; return true; } @@ -1820,7 +1820,7 @@ static bool PeepInteractWithEntrance(Peep* peep, const CoordsXYE& coords, uint8_ } // Guest has decided to go on the ride. - guest->ActionSpriteImageOffset = _backupActionSpriteImageOffset; + guest->AnimationImageIdOffset = _backupAnimationImageIdOffset; guest->InteractionRideIndex = rideIndex; auto& station = ride->GetStation(stationNum); @@ -2399,7 +2399,7 @@ static bool PeepInteractWithShop(Peep* peep, const CoordsXYE& coords) { if (guest->GuestHeadingToRideId == rideIndex) guest->GuestHeadingToRideId = RideId::GetNull(); - guest->ActionSpriteImageOffset = _backupActionSpriteImageOffset; + guest->AnimationImageIdOffset = _backupAnimationImageIdOffset; guest->SetState(PeepState::Buying); guest->CurrentRide = rideIndex; guest->SubState = 0; @@ -2809,7 +2809,7 @@ void Peep::Serialise(DataSerialiser& stream) stream << SpecialSprite; stream << AnimationType; stream << NextAnimationType; - stream << ActionSpriteImageOffset; + stream << AnimationImageIdOffset; stream << Action; stream << AnimationFrameNum; stream << StepProgress; @@ -2860,7 +2860,7 @@ void Peep::Paint(PaintSession& session, int32_t imageDirection) const } PeepAnimationType actionSpriteType = AnimationType; - uint8_t imageOffset = ActionSpriteImageOffset; + uint8_t imageOffset = AnimationImageIdOffset; if (Action == PeepActionType::Idle) { diff --git a/src/openrct2/entity/Peep.h b/src/openrct2/entity/Peep.h index 9a3bbcd4b7..44cef90904 100644 --- a/src/openrct2/entity/Peep.h +++ b/src/openrct2/entity/Peep.h @@ -356,7 +356,7 @@ struct Peep : EntityBase // Seems to be used like a local variable, as it's always set before calling SwitchNextAnimationType, which // reads this again PeepAnimationType NextAnimationType; - uint8_t ActionSpriteImageOffset; + uint8_t AnimationImageIdOffset; PeepActionType Action; uint8_t AnimationFrameNum; uint8_t StepProgress; diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 0eb4c73fbd..a1aa97bf17 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -916,7 +916,7 @@ bool Staff::DoEntertainerPathFinding() { Action = (ScenarioRand() & 1) ? PeepActionType::Wave2 : PeepActionType::Joy; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); EntertainerUpdateNearbyPeeps(); @@ -1114,7 +1114,7 @@ void Staff::UpdateWatering() Orientation = (Var37 & 3) << 3; Action = PeepActionType::StaffWatering; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); SubState = 1; @@ -1178,7 +1178,7 @@ void Staff::UpdateEmptyingBin() Orientation = (Var37 & 3) << 3; Action = PeepActionType::StaffEmptyBin; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); SubState = 1; @@ -1267,7 +1267,7 @@ void Staff::UpdateSweeping() { Action = PeepActionType::StaffSweep; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); return; } @@ -1395,7 +1395,7 @@ void Staff::UpdateAnswering() { Action = PeepActionType::StaffAnswerCall; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); @@ -1699,7 +1699,7 @@ void Staff::Tick128UpdateStaff() return; SpriteType = newSpriteType; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; WalkingAnimationFrameNum = 0; if (Action < PeepActionType::Idle) Action = PeepActionType::Walking; @@ -2092,7 +2092,7 @@ bool Staff::UpdateFixingFixVehicle(bool firstRun, const Ride& ride) Orientation = PeepDirection << 3; Action = (ScenarioRand() & 1) ? PeepActionType::StaffFix2 : PeepActionType::StaffFix; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; AnimationFrameNum = 0; UpdateCurrentAnimationType(); } @@ -2133,7 +2133,7 @@ bool Staff::UpdateFixingFixVehicleMalfunction(bool firstRun, const Ride& ride) { Orientation = PeepDirection << 3; Action = PeepActionType::StaffFix3; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; AnimationFrameNum = 0; UpdateCurrentAnimationType(); @@ -2240,7 +2240,7 @@ bool Staff::UpdateFixingFixStationEnd(bool firstRun) Orientation = PeepDirection << 3; Action = PeepActionType::StaffCheckboard; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); } @@ -2355,7 +2355,7 @@ bool Staff::UpdateFixingFixStationStart(bool firstRun, const Ride& ride) Action = PeepActionType::StaffFix; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); } @@ -2383,7 +2383,7 @@ bool Staff::UpdateFixingFixStationBrakes(bool firstRun, Ride& ride) Action = PeepActionType::StaffFixGround; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); } @@ -2474,7 +2474,7 @@ bool Staff::UpdateFixingFinishFixOrInspect(bool firstRun, int32_t steps, Ride& r Orientation = PeepDirection << 3; Action = PeepActionType::StaffAnswerCall2; AnimationFrameNum = 0; - ActionSpriteImageOffset = 0; + AnimationImageIdOffset = 0; UpdateCurrentAnimationType(); } diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index d8b2027281..b4e770fd89 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -1789,7 +1789,7 @@ namespace OpenRCT2 cs.ReadWrite(entity.SpecialSprite); cs.ReadWrite(entity.AnimationType); cs.ReadWrite(entity.NextAnimationType); - cs.ReadWrite(entity.ActionSpriteImageOffset); + cs.ReadWrite(entity.AnimationImageIdOffset); cs.ReadWrite(entity.Action); cs.ReadWrite(entity.AnimationFrameNum); cs.ReadWrite(entity.StepProgress); diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index 6eb63e72bc..f897784225 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -604,10 +604,10 @@ namespace OpenRCT2::RCT1 uint8_t AnimationType; // 0x6E // Seems to be used like a local variable, as it's always set before calling SwitchNextAnimationType, which reads // this again - uint8_t NextAnimationType; // 0x6F - uint8_t ActionSpriteImageOffset; // 0x70 - uint8_t Action; // 0x71 - uint8_t AnimationFrameNum; // 0x72 + uint8_t NextAnimationType; // 0x6F + uint8_t AnimationImageIdOffset; // 0x70 + uint8_t Action; // 0x71 + uint8_t AnimationFrameNum; // 0x72 uint8_t StepProgress; union { diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 1cec049db7..d10ea4e38e 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1302,7 +1302,7 @@ namespace OpenRCT2::RCT1 dst->Action = static_cast(src->Action); dst->SpecialSprite = src->SpecialSprite; dst->NextAnimationType = static_cast(src->NextAnimationType); - dst->ActionSpriteImageOffset = src->ActionSpriteImageOffset; + dst->AnimationImageIdOffset = src->AnimationImageIdOffset; dst->WalkingAnimationFrameNum = src->NoActionFrameNum; dst->AnimationType = static_cast(src->AnimationType); dst->AnimationFrameNum = src->AnimationFrameNum; diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index fe03889bcf..a0423d6cee 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -592,13 +592,13 @@ namespace OpenRCT2::RCT2 uint8_t StandingFlags; // 0x6C }; }; - uint8_t SpecialSprite; // 0x6D - uint8_t AnimationType; // 0x6E - uint8_t NextAnimationType; // 0x6F - uint8_t ActionSpriteImageOffset; // 0x70 - uint8_t Action; // 0x71 - uint8_t AnimationFrameNum; // 0x72 - uint8_t StepProgress; // 0x73 + uint8_t SpecialSprite; // 0x6D + uint8_t AnimationType; // 0x6E + uint8_t NextAnimationType; // 0x6F + uint8_t AnimationImageIdOffset; // 0x70 + uint8_t Action; // 0x71 + uint8_t AnimationFrameNum; // 0x72 + uint8_t StepProgress; // 0x73 union { uint16_t MechanicTimeSinceCall; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index adc562b9cb..a5e0f51d65 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1631,7 +1631,7 @@ namespace OpenRCT2::RCT2 dst->SpecialSprite = src->SpecialSprite; dst->AnimationType = static_cast(src->AnimationType); dst->NextAnimationType = static_cast(src->NextAnimationType); - dst->ActionSpriteImageOffset = src->ActionSpriteImageOffset; + dst->AnimationImageIdOffset = src->AnimationImageIdOffset; dst->Action = static_cast(src->Action); dst->AnimationFrameNum = src->AnimationFrameNum; dst->StepProgress = src->StepProgress; diff --git a/src/openrct2/scripting/bindings/entity/ScGuest.cpp b/src/openrct2/scripting/bindings/entity/ScGuest.cpp index 6108a0b5b1..99b89207be 100644 --- a/src/openrct2/scripting/bindings/entity/ScGuest.cpp +++ b/src/openrct2/scripting/bindings/entity/ScGuest.cpp @@ -947,7 +947,7 @@ namespace OpenRCT2::Scripting peep->AnimationFrameNum = offset; auto& animationGroup = GetPeepAnimation(peep->SpriteType, peep->AnimationType); - peep->ActionSpriteImageOffset = animationGroup.frame_offsets[offset]; + peep->AnimationImageIdOffset = animationGroup.frame_offsets[offset]; peep->UpdateSpriteBoundingBox(); } @@ -980,7 +980,7 @@ namespace OpenRCT2::Scripting else peep->AnimationFrameNum = offset; - peep->ActionSpriteImageOffset = animationGroup.frame_offsets[offset]; + peep->AnimationImageIdOffset = animationGroup.frame_offsets[offset]; peep->UpdateSpriteBoundingBox(); } diff --git a/src/openrct2/scripting/bindings/entity/ScStaff.cpp b/src/openrct2/scripting/bindings/entity/ScStaff.cpp index 50dcd9488f..3c0e356318 100644 --- a/src/openrct2/scripting/bindings/entity/ScStaff.cpp +++ b/src/openrct2/scripting/bindings/entity/ScStaff.cpp @@ -389,7 +389,7 @@ namespace OpenRCT2::Scripting peep->AnimationFrameNum = offset; auto& animationGroup = GetPeepAnimation(peep->SpriteType, peep->AnimationType); - peep->ActionSpriteImageOffset = animationGroup.frame_offsets[offset]; + peep->AnimationImageIdOffset = animationGroup.frame_offsets[offset]; peep->UpdateSpriteBoundingBox(); } @@ -422,7 +422,7 @@ namespace OpenRCT2::Scripting else peep->AnimationFrameNum = offset; - peep->ActionSpriteImageOffset = animationGroup.frame_offsets[offset]; + peep->AnimationImageIdOffset = animationGroup.frame_offsets[offset]; peep->UpdateSpriteBoundingBox(); } diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp index 020c02e092..72cfa5ece1 100644 --- a/src/openrct2/world/MapAnimation.cpp +++ b/src/openrct2/world/MapAnimation.cpp @@ -211,7 +211,7 @@ static bool MapAnimationInvalidateSmallScenery(const CoordsXYZ& loc) peep->Action = PeepActionType::CheckTime; peep->AnimationFrameNum = 0; - peep->ActionSpriteImageOffset = 0; + peep->AnimationImageIdOffset = 0; peep->UpdateCurrentAnimationType(); peep->Invalidate(); break;