From 0f9178568b3470d35ffc1d5e21a230d8cc11eef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Mon, 16 Sep 2019 20:32:58 +0300 Subject: Peds, a fix and a tad of VC --- src/peds/CivilianPed.cpp | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'src/peds/CivilianPed.cpp') 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 -- cgit v1.2.3