diff options
author | aap <aap@papnet.eu> | 2019-07-16 18:31:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-16 18:31:29 +0200 |
commit | 3fee2bef9888e188b07e011067652388a5585f96 (patch) | |
tree | b80e8bc8569fbdda5929123a8f47d0c62aea0ab0 /src/peds/CivilianPed.cpp | |
parent | Merge pull request #136 from Nick007J/master (diff) | |
parent | Merge branch 'master' into erorcun (diff) | |
download | re3-3fee2bef9888e188b07e011067652388a5585f96.tar re3-3fee2bef9888e188b07e011067652388a5585f96.tar.gz re3-3fee2bef9888e188b07e011067652388a5585f96.tar.bz2 re3-3fee2bef9888e188b07e011067652388a5585f96.tar.lz re3-3fee2bef9888e188b07e011067652388a5585f96.tar.xz re3-3fee2bef9888e188b07e011067652388a5585f96.tar.zst re3-3fee2bef9888e188b07e011067652388a5585f96.zip |
Diffstat (limited to '')
-rw-r--r-- | src/peds/CivilianPed.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp index 717eaa3f..3b1f9e1c 100644 --- a/src/peds/CivilianPed.cpp +++ b/src/peds/CivilianPed.cpp @@ -1,6 +1,7 @@ #include "common.h" #include "patcher.h" #include "CivilianPed.h" +#include "Phones.h" WRAPPER void CCivilianPed::ProcessControl(void) { EAXJMP(0x4BFFE0); } @@ -13,6 +14,28 @@ CCivilianPed::CCivilianPed(int pedtype, int mi) : CPed(pedtype) } } +bool +CCivilianPed::ProcessNearestFreePhone(int unused) +{ + if (m_nPedState == PED_SEEK_POS) + return false; + + int phoneId = gPhoneInfo.FindNearestFreePhone(&GetPosition()); + + if (phoneId == -1) + return false; + + if (gPhoneInfo.m_aPhones[phoneId].m_nState != PHONE_STATE_FREE) + return false; + + field_31C = 1; + SetMoveState(PEDMOVE_RUN); + SetSeek(gPhoneInfo.m_aPhones[phoneId].m_vecPos, 0.3f); + m_phoneId = phoneId; + m_lookingForPhone = unused; + return true; +} + class CCivilianPed_ : public CCivilianPed { public: @@ -23,4 +46,5 @@ public: STARTPATCHES InjectHook(0x4BFF30, &CCivilianPed_::ctor, PATCH_JUMP); InjectHook(0x4BFFC0, &CCivilianPed_::dtor, PATCH_JUMP); + InjectHook(0x4C10C0, &CCivilianPed::ProcessNearestFreePhone, PATCH_JUMP); ENDPATCHES |