diff options
author | aap <aap@papnet.eu> | 2020-06-25 15:15:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-25 15:15:01 +0200 |
commit | 592a6aef0bb336f1364e6bf38230f3793ec35c4d (patch) | |
tree | 3b8df6abb470acc7b9b55d0e8476e1478ba626c0 /src/control/Phones.cpp | |
parent | rename attractor flag to type (diff) | |
parent | CWanted, anim fix, ped objs renaming, remove III beta features (diff) | |
download | re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.gz re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.bz2 re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.lz re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.xz re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.zst re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.zip |
Diffstat (limited to 'src/control/Phones.cpp')
-rw-r--r-- | src/control/Phones.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp index 6fac3f9d..c0b50119 100644 --- a/src/control/Phones.cpp +++ b/src/control/Phones.cpp @@ -34,18 +34,6 @@ CPed *CPhoneInfo::pCallBackPed; // ped who picking up the phone (reset after pic after 60 seconds of last phone pick-up. */ -#ifdef TOGGLEABLE_BETA_FEATURES -CPed* crimeReporters[NUMPHONES] = {}; -bool -isPhoneAvailable(int m_phoneId) -{ - return gPhoneInfo.m_aPhones[m_phoneId].m_nState == PHONE_STATE_FREE && - (crimeReporters[m_phoneId] == nil || !crimeReporters[m_phoneId]->IsPointerValid() || !crimeReporters[m_phoneId]->bRunningToPhone || crimeReporters[m_phoneId]->m_objective > OBJECTIVE_IDLE || - crimeReporters[m_phoneId]->m_nLastPedState != PED_SEEK_POS && - (crimeReporters[m_phoneId]->m_nPedState != PED_MAKE_CALL && crimeReporters[m_phoneId]->m_nPedState != PED_FACE_PHONE && crimeReporters[m_phoneId]->m_nPedState != PED_SEEK_POS)); -} -#endif - void CPhoneInfo::Update(void) { @@ -164,11 +152,7 @@ CPhoneInfo::FindNearestFreePhone(CVector *pos) for (int phoneId = 0; phoneId < m_nMax; phoneId++) { - if (gPhoneInfo.m_aPhones[phoneId].m_nState == PHONE_STATE_FREE -#ifdef TOGGLEABLE_BETA_FEATURES - && isPhoneAvailable(phoneId) -#endif - ) { + if (gPhoneInfo.m_aPhones[phoneId].m_nState == PHONE_STATE_FREE) { float phoneDist = (m_aPhones[phoneId].m_vecPos - *pos).Magnitude2D(); if (phoneDist < nearestPhoneDist) { |