summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-12-15 04:11:45 +0100
committerSergeanur <s.anureev@yandex.ua>2020-12-15 04:11:45 +0100
commit8f2abc675035f1c864308e77b78906d4f6bedd24 (patch)
tree16ea2aa95ac68dc75cc237749780200c110c457f /src
parentUse SetMoveState (diff)
downloadre3-8f2abc675035f1c864308e77b78906d4f6bedd24.tar
re3-8f2abc675035f1c864308e77b78906d4f6bedd24.tar.gz
re3-8f2abc675035f1c864308e77b78906d4f6bedd24.tar.bz2
re3-8f2abc675035f1c864308e77b78906d4f6bedd24.tar.lz
re3-8f2abc675035f1c864308e77b78906d4f6bedd24.tar.xz
re3-8f2abc675035f1c864308e77b78906d4f6bedd24.tar.zst
re3-8f2abc675035f1c864308e77b78906d4f6bedd24.zip
Diffstat (limited to 'src')
-rw-r--r--src/peds/CopPed.cpp2
-rw-r--r--src/peds/Ped.cpp5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp
index 5f5a80b1..9684794a 100644
--- a/src/peds/CopPed.cpp
+++ b/src/peds/CopPed.cpp
@@ -249,7 +249,7 @@ CCopPed::ArrestPlayer(void)
CPed *suspect = (CPed*)m_pSeekTarget;
if (suspect) {
if (suspect->CanSetPedState())
- SetPedState(PED_ARRESTED);
+ suspect->SetPedState(PED_ARRESTED);
if (suspect->bInVehicle && m_pMyVehicle && suspect->m_pMyVehicle == m_pMyVehicle) {
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index d7abcf0c..d63a4d22 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -812,8 +812,7 @@ CPed::RestorePreviousState(void)
SetWanderPath(m_nPedState == PED_FOLLOW_PATH ? m_nPathDir : CGeneral::GetRandomNumber() & 7);
break;
default:
- PedState oldState = m_nLastPedState;
- SetPedState(oldState);
+ SetPedState(m_nLastPedState);
SetMoveState((eMoveState) m_nPrevMoveState);
break;
}
@@ -1602,7 +1601,7 @@ CPed::ClearAll(void)
return;
SetPedState(PED_NONE);
- m_nMoveState = PEDMOVE_NONE;
+ SetMoveState(PEDMOVE_NONE);
m_pSeekTarget = nil;
m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f);
m_fleeFromPos = CVector2D(0.0f, 0.0f);