summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-26 01:34:32 +0200
committerGitHub <noreply@github.com>2019-07-26 01:34:32 +0200
commit8804aafc6a9f7cd69f51e248546d2f889e65c242 (patch)
treef86d3d0e5b4ec32026775eb9ede17e894d6ca40e /src/control
parentRunning script part 3 (diff)
parentMerge pull request #162 from erorcun/erorcun (diff)
downloadre3-8804aafc6a9f7cd69f51e248546d2f889e65c242.tar
re3-8804aafc6a9f7cd69f51e248546d2f889e65c242.tar.gz
re3-8804aafc6a9f7cd69f51e248546d2f889e65c242.tar.bz2
re3-8804aafc6a9f7cd69f51e248546d2f889e65c242.tar.lz
re3-8804aafc6a9f7cd69f51e248546d2f889e65c242.tar.xz
re3-8804aafc6a9f7cd69f51e248546d2f889e65c242.tar.zst
re3-8804aafc6a9f7cd69f51e248546d2f889e65c242.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Phones.cpp6
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;
}