summaryrefslogtreecommitdiffstats
path: root/src/peds/CivilianPed.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-09-16 19:32:58 +0200
committereray orçunus <erayorcunus@gmail.com>2019-09-17 22:22:34 +0200
commit0f9178568b3470d35ffc1d5e21a230d8cc11eef1 (patch)
treee6b421513dfac9908ae727290ab7ec947842cdf3 /src/peds/CivilianPed.cpp
parentMerge pull request #208 from Nick007J/master (diff)
downloadre3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar
re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.gz
re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.bz2
re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.lz
re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.xz
re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.zst
re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.zip
Diffstat (limited to 'src/peds/CivilianPed.cpp')
-rw-r--r--src/peds/CivilianPed.cpp26
1 files changed, 1 insertions, 25 deletions
diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp
index f28a1134..93cdcb3d 100644
--- a/src/peds/CivilianPed.cpp
+++ b/src/peds/CivilianPed.cpp
@@ -8,34 +8,11 @@ WRAPPER void CCivilianPed::ProcessControl(void) { EAXJMP(0x4BFFE0); }
CCivilianPed::CCivilianPed(int pedtype, int mi) : CPed(pedtype)
{
SetModelIndex(mi);
- for (int i = 0; i < 10; i++)
- {
+ for (int i = 0; i < 10; i++) {
m_nearPeds[i] = nil;
}
}
-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;
-
- bRunningToPhone = true;
- 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:
@@ -46,5 +23,4 @@ public:
STARTPATCHES
InjectHook(0x4BFF30, &CCivilianPed_::ctor, PATCH_JUMP);
InjectHook(0x4BFFC0, &CCivilianPed_::dtor, PATCH_JUMP);
- InjectHook(0x4C10C0, &CCivilianPed::ProcessNearestFreePhone, PATCH_JUMP);
ENDPATCHES