diff options
| author | aap <aap@papnet.eu> | 2019-07-26 01:34:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-26 01:34:32 +0200 |
| commit | 8804aafc6a9f7cd69f51e248546d2f889e65c242 (patch) | |
| tree | f86d3d0e5b4ec32026775eb9ede17e894d6ca40e /src/control | |
| parent | 5acce16261606f06e39e09d0bd6ec0d95787ae38 (diff) | |
| parent | a9f4ba12d7aeccdff8a021b28956fe5a993a5eac (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Phones.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp index 376e2757..499fa253 100644 --- a/src/control/Phones.cpp +++ b/src/control/Phones.cpp @@ -210,7 +210,7 @@ PhonePutDownCB(CAnimBlendAssociation *assoc, void *arg) CPed *ped = (CPed*)arg; if (assoc->blendAmount > 0.5f) - ped->m_ped_flagC10 = true; + ped->bUpdateAnimHeading = true; if (ped->m_nPedState == PED_MAKE_CALL) ped->m_nPedState = PED_IDLE; @@ -244,10 +244,10 @@ PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg) CPed *ped = CPhoneInfo::pedWhoPickingUpPhone; ped->m_nMoveState = PEDMOVE_STILL; - CAnimManager::BlendAnimation((RpClump*)ped->m_rwObject, ASSOCGRP_STD, ANIM_IDLE_STANCE, 8.0f); + CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_IDLE_STANCE, 8.0f); if (assoc->blendAmount > 0.5f && ped) - CAnimManager::BlendAnimation((RpClump*)ped->m_rwObject, ASSOCGRP_STD, ANIM_PHONE_TALK, 8.0f); + CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_PHONE_TALK, 8.0f); CPhoneInfo::pedWhoPickingUpPhone = nil; } |