summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-12-15 02:25:05 +0100
committerSergeanur <s.anureev@yandex.ua>2020-12-15 02:25:05 +0100
commitab3e258f19808641dde8940622d1fadb33ed18cb (patch)
tree0df30be50812691b8915e8c0653f12dd38886f6f /src/control
parentFix language initialization call order (diff)
downloadre3-ab3e258f19808641dde8940622d1fadb33ed18cb.tar
re3-ab3e258f19808641dde8940622d1fadb33ed18cb.tar.gz
re3-ab3e258f19808641dde8940622d1fadb33ed18cb.tar.bz2
re3-ab3e258f19808641dde8940622d1fadb33ed18cb.tar.lz
re3-ab3e258f19808641dde8940622d1fadb33ed18cb.tar.xz
re3-ab3e258f19808641dde8940622d1fadb33ed18cb.tar.zst
re3-ab3e258f19808641dde8940622d1fadb33ed18cb.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 edbfe6c2..cc80360d 100644
--- a/src/control/Phones.cpp
+++ b/src/control/Phones.cpp
@@ -58,7 +58,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;
@@ -105,7 +105,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);
@@ -333,7 +333,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 1f47c9b9..3fa416f8 100644
--- a/src/control/Script5.cpp
+++ b/src/control/Script5.cpp
@@ -2125,7 +2125,7 @@ void CTheScripts::CleanUpThisPed(CPed* pPed)
if (pPed->m_nPedState == PED_FOLLOW_PATH && state != PED_FOLLOW_PATH)
pPed->ClearFollowPath();
- pPed->m_nPedState = state;
+ pPed->SetPedState(state);
pPed->SetMoveState(ms);
}
--CPopulation::ms_nTotalMissionPeds;