summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-12-15 04:11:02 +0100
committerSergeanur <s.anureev@yandex.ua>2020-12-15 04:11:02 +0100
commitf76dfaee82c0573518d247f7d5666151ccfed765 (patch)
treee2a4357d5b50c4648fb1ee88963ec1d95c67e357 /src/control
parentMerge pull request #882 from GTAmodding/ShFil119-patch-1 (diff)
downloadre3-f76dfaee82c0573518d247f7d5666151ccfed765.tar
re3-f76dfaee82c0573518d247f7d5666151ccfed765.tar.gz
re3-f76dfaee82c0573518d247f7d5666151ccfed765.tar.bz2
re3-f76dfaee82c0573518d247f7d5666151ccfed765.tar.lz
re3-f76dfaee82c0573518d247f7d5666151ccfed765.tar.xz
re3-f76dfaee82c0573518d247f7d5666151ccfed765.tar.zst
re3-f76dfaee82c0573518d247f7d5666151ccfed765.zip
Diffstat (limited to '')
-rw-r--r--src/control/Phones.cpp6
-rw-r--r--src/control/Script5.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp
index c951e868..4769559c 100644
--- a/src/control/Phones.cpp
+++ b/src/control/Phones.cpp
@@ -67,7 +67,7 @@ CPhoneInfo::Update(void)
} else {
CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_PHONE);
if (player->m_nPedState == PED_MAKE_CALL)
- player->m_nPedState = PED_IDLE;
+ player->SetPedState(PED_IDLE);
}
}
bool notInCar;
@@ -114,7 +114,7 @@ CPhoneInfo::Update(void)
player->m_fRotationCur = angleToFace;
player->m_fRotationDest = angleToFace;
player->SetHeading(angleToFace);
- player->m_nPedState = PED_MAKE_CALL;
+ player->SetPedState(PED_MAKE_CALL);
CPad::GetPad(0)->SetDisablePlayerControls(PLAYERCONTROL_PHONE);
TheCamera.SetWideScreenOn();
playerInfo->MakePlayerSafe(true);
@@ -412,7 +412,7 @@ PhonePutDownCB(CAnimBlendAssociation *assoc, void *arg)
ped->bUpdateAnimHeading = true;
if (ped->m_nPedState == PED_MAKE_CALL)
- ped->m_nPedState = PED_IDLE;
+ ped->SetPedState(PED_IDLE);
}
void
diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp
index 164ca036..4826192e 100644
--- a/src/control/Script5.cpp
+++ b/src/control/Script5.cpp
@@ -1921,7 +1921,7 @@ void CTheScripts::CleanUpThisPed(CPed* pPed)
if (pPed->IsPedInControl())
pPed->SetWanderPath(CGeneral::GetRandomNumber() & 7);
if (flees) {
- pPed->m_nPedState = state;
+ pPed->SetPedState(state);
pPed->SetMoveState(ms);
}
--CPopulation::ms_nTotalMissionPeds;