summaryrefslogtreecommitdiffstats
path: root/src/control/Phones.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-06-21 15:00:17 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-06-21 15:00:17 +0200
commit7a71a47f743b1496c069cf5c4f2765877aea412b (patch)
treec8f3183ea7af47d9d01fb5b661b359d92fb56440 /src/control/Phones.cpp
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-7a71a47f743b1496c069cf5c4f2765877aea412b.tar
re3-7a71a47f743b1496c069cf5c4f2765877aea412b.tar.gz
re3-7a71a47f743b1496c069cf5c4f2765877aea412b.tar.bz2
re3-7a71a47f743b1496c069cf5c4f2765877aea412b.tar.lz
re3-7a71a47f743b1496c069cf5c4f2765877aea412b.tar.xz
re3-7a71a47f743b1496c069cf5c4f2765877aea412b.tar.zst
re3-7a71a47f743b1496c069cf5c4f2765877aea412b.zip
Diffstat (limited to '')
-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 6fac3f9d..b89641f9 100644
--- a/src/control/Phones.cpp
+++ b/src/control/Phones.cpp
@@ -66,7 +66,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;
}
@@ -116,7 +116,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);
@@ -340,7 +340,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)