diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2019-08-02 22:23:05 +0200 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2019-08-02 22:23:05 +0200 |
| commit | 73e2a4b035e19ace0ad5c55c58a15ee1d8265fee (patch) | |
| tree | eafd98b48c650c84139804ca89259ae61e00e3ea /src/control/Phones.cpp | |
| parent | fix (diff) | |
| parent | restore original shadows fading (diff) | |
| download | re3-73e2a4b035e19ace0ad5c55c58a15ee1d8265fee.tar re3-73e2a4b035e19ace0ad5c55c58a15ee1d8265fee.tar.gz re3-73e2a4b035e19ace0ad5c55c58a15ee1d8265fee.tar.bz2 re3-73e2a4b035e19ace0ad5c55c58a15ee1d8265fee.tar.lz re3-73e2a4b035e19ace0ad5c55c58a15ee1d8265fee.tar.xz re3-73e2a4b035e19ace0ad5c55c58a15ee1d8265fee.tar.zst re3-73e2a4b035e19ace0ad5c55c58a15ee1d8265fee.zip | |
Diffstat (limited to 'src/control/Phones.cpp')
| -rw-r--r-- | src/control/Phones.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp index 376e2757..e2a9ee13 100644 --- a/src/control/Phones.cpp +++ b/src/control/Phones.cpp @@ -76,6 +76,7 @@ CPhoneInfo::Load(CPhoneInfo *source, uint8 buffer) m_aPhones[phoneId].m_vecPos = phone->m_vecPos; memcpy(m_aPhones[phoneId].m_apMessages, phone->m_apMessages, sizeof(wchar*) * 6); + m_aPhones[phoneId].m_lastTimeRepeatedMsgShown = phone->m_lastTimeRepeatedMsgShown; m_aPhones[phoneId].m_pEntity = phone->m_pEntity; m_aPhones[phoneId].m_nState = phone->m_nState; m_aPhones[phoneId].field_30 = phone->field_30; @@ -183,13 +184,14 @@ CPhoneInfo::Save(CPhoneInfo *destination, uint32 *size) phone->m_vecPos = m_aPhones[phoneId].m_vecPos; memcpy(phone->m_apMessages, m_aPhones[phoneId].m_apMessages, sizeof(wchar*) * 6); + phone->m_lastTimeRepeatedMsgShown = m_aPhones[phoneId].m_lastTimeRepeatedMsgShown; phone->m_pEntity = m_aPhones[phoneId].m_pEntity; phone->m_nState = m_aPhones[phoneId].m_nState; phone->field_30 = m_aPhones[phoneId].field_30; // Convert entity pointer to building pool index while saving if (phone->m_pEntity) { - phone->m_pEntity = (CEntity*) CPools::GetBuildingPool()->GetJustIndex((CBuilding*)phone->m_pEntity) + 1; + phone->m_pEntity = (CEntity*) (CPools::GetBuildingPool()->GetJustIndex((CBuilding*)phone->m_pEntity) + 1); } } } @@ -210,7 +212,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 +246,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; } |