diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-06-21 15:00:17 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-06-21 15:00:17 +0200 |
| commit | 7a71a47f743b1496c069cf5c4f2765877aea412b (patch) | |
| tree | c8f3183ea7af47d9d01fb5b661b359d92fb56440 /src/control | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| download | re3-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 'src/control')
| -rw-r--r-- | src/control/Phones.cpp | 6 | ||||
| -rw-r--r-- | src/control/Script.cpp | 4 |
2 files changed, 5 insertions, 5 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) diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 98cd6369..39f5a6d6 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -9958,7 +9958,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command) SaveGameForPause(3); #endif CPlayerInfo* pPlayerInfo = &CWorld::Players[ScriptParams[0]]; - CPad::GetPad(ScriptParams[0])->DisablePlayerControls |= PLAYERCONTROL_DISABLED_80; + CPad::GetPad(ScriptParams[0])->SetDisablePlayerControls(PLAYERCONTROL_CUTSCENE); pPlayerInfo->MakePlayerSafe(true); CCutsceneMgr::StartCutsceneProcessing(); return 0; @@ -10684,7 +10684,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command) printf("End preload end of game audio\n"); return 0; case COMMAND_ENABLE_PLAYER_CONTROL_CAMERA: - CPad::GetPad(0)->DisablePlayerControls &= PLAYERCONTROL_DISABLED_1; + CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_CAMERA); return 0; #ifndef GTA_PS2 // To be precise, on PS2 previous handlers were in 1000-1099 function |