diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-06-29 11:56:50 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-06-29 11:56:50 +0200 |
| commit | b26eec5dafc7720d2c8e61db7dd6da29442cab94 (patch) | |
| tree | 4dfc58239c4555d4d4e6d0b327b65b7dab6cae65 /src/control/Phones.cpp | |
| parent | renamed 2dfx shadowRange to Size (diff) | |
| parent | Update MemoryCard.cpp (diff) | |
| download | re3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.tar re3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.tar.gz re3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.tar.bz2 re3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.tar.lz re3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.tar.xz re3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.tar.zst re3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.zip | |
Diffstat (limited to 'src/control/Phones.cpp')
| -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 c0b50119..4f1703f2 100644 --- a/src/control/Phones.cpp +++ b/src/control/Phones.cpp @@ -54,7 +54,7 @@ CPhoneInfo::Update(void) endAssoc->flags &= ~ASSOC_DELETEFADEDOUT; endAssoc->SetFinishCallback(PhonePutDownCB, player); } else { - CPad::GetPad(0)->DisablePlayerControls &= ~PLAYERCONTROL_DISABLED_40; + CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_PHONE); if (player->m_nPedState == PED_MAKE_CALL) player->m_nPedState = PED_IDLE; } @@ -104,7 +104,7 @@ CPhoneInfo::Update(void) player->m_fRotationDest = angleToFace; player->SetHeading(angleToFace); player->m_nPedState = PED_MAKE_CALL; - CPad::GetPad(0)->DisablePlayerControls |= PLAYERCONTROL_DISABLED_40; + CPad::GetPad(0)->SetDisablePlayerControls(PLAYERCONTROL_PHONE); TheCamera.SetWideScreenOn(); playerInfo->MakePlayerSafe(true); CAnimBlendAssociation *phonePickAssoc = CAnimManager::BlendAnimation(player->GetClump(), ASSOCGRP_STD, ANIM_PHONE_IN, 4.0f); @@ -324,7 +324,7 @@ PhonePutDownCB(CAnimBlendAssociation *assoc, void *arg) { assoc->flags |= ASSOC_DELETEFADEDOUT; assoc->blendDelta = -1000.0f; - CPad::GetPad(0)->DisablePlayerControls &= ~PLAYERCONTROL_DISABLED_40; + CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_PHONE); CPed *ped = (CPed*)arg; if (assoc->blendAmount > 0.5f) |