diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-06-22 03:02:44 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-06-22 03:20:56 +0200 |
| commit | f3ed6659c32ec61c2c4c806707655e0c58123e4c (patch) | |
| tree | 1d71dd86ef08d87e4ed703302224d330cecf4ae2 /src/control/Phones.cpp | |
| parent | killing peds increase chaos level (diff) | |
| download | re3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.tar re3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.tar.gz re3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.tar.bz2 re3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.tar.lz re3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.tar.xz re3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.tar.zst re3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.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) { |