summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-26 01:32:38 +0200
committerGitHub <noreply@github.com>2019-07-26 01:32:38 +0200
commita9f4ba12d7aeccdff8a021b28956fe5a993a5eac (patch)
tree0351cb51adcacf2cdf0f006d23e2ce7bd8081e3c /src/control
parentimplemented CAutomobile::TankControl (diff)
parentPed & fixes, including peds dive into danger fix (diff)
downloadre3-a9f4ba12d7aeccdff8a021b28956fe5a993a5eac.tar
re3-a9f4ba12d7aeccdff8a021b28956fe5a993a5eac.tar.gz
re3-a9f4ba12d7aeccdff8a021b28956fe5a993a5eac.tar.bz2
re3-a9f4ba12d7aeccdff8a021b28956fe5a993a5eac.tar.lz
re3-a9f4ba12d7aeccdff8a021b28956fe5a993a5eac.tar.xz
re3-a9f4ba12d7aeccdff8a021b28956fe5a993a5eac.tar.zst
re3-a9f4ba12d7aeccdff8a021b28956fe5a993a5eac.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;
}