mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Guest window: make pickup animation lengths dynamic

Browse source
This commit is contained in:
Aaron van Geffen 2024-12-10 22:52:05 +01:00
parent f3a0593591
commit 3c87ae6a92
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/openrct2-ui/windows/Guest.cpp
View file

@ -875,21 +875,30 @@ namespace OpenRCT2::Ui::Windows
void OnUpdateOverview()
{
_guestAnimationFrame++;
_guestAnimationFrame %= 24;
// Update pickup animation, can only happen in this tab.
picked_peep_frame++;
picked_peep_frame %= 48;
WidgetInvalidate(*this, WIDX_TAB_1);
WidgetInvalidate(*this, WIDX_TAB_2);
const auto peep = GetGuest();
if (peep == nullptr)
{
return;
}
auto& objManager = GetContext()->GetObjectManager();
auto* animObj = objManager.GetLoadedObject<PeepAnimationsObject>(peep->AnimationObjectIndex);
// Overview tab animation offset
_guestAnimationFrame++;
_guestAnimationFrame %= 24;
// Get pickup animation length
const auto& pickAnim = animObj->GetPeepAnimation(peep->AnimationGroup, PeepAnimationType::Hanging);
const auto pickAnimLength = pickAnim.frame_offsets.size();
// Update pickup animation, can only happen in this tab.
picked_peep_frame++;
picked_peep_frame %= pickAnimLength * 4;
WidgetInvalidate(*this, WIDX_TAB_1);
WidgetInvalidate(*this, WIDX_TAB_2);
if (peep->WindowInvalidateFlags & PEEP_INVALIDATE_PEEP_ACTION)
{
peep->WindowInvalidateFlags &= ~PEEP_INVALIDATE_PEEP_ACTION;