From d5d2f6a822ecc655437c5121550db6d929508036 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sun, 17 May 2020 21:48:21 +0300 Subject: [PATCH] sync with upstream --- src/control/Pickups.cpp | 10 ---------- src/control/Pickups.h | 2 -- src/peds/Ped.h | 1 - 3 files changed, 13 deletions(-) diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index 02f2335d..01a28193 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -1458,13 +1458,3 @@ CPacManPickups::ResetPowerPillsCarriedByPlayer() FindPlayerVehicle()->m_fForceMultiplier = 1.0f; } } - -bool -CPickups::TestForPickupsInBubble(CVector pos, float radius) -{ - for (int i = 0; i < NUMPICKUPS; i++) { - if ((pos - aPickUps[i].m_vecPos).Magnitude() < radius) - return true; - } - return false; -} diff --git a/src/control/Pickups.h b/src/control/Pickups.h index 3971002c..810f3dff 100644 --- a/src/control/Pickups.h +++ b/src/control/Pickups.h @@ -94,8 +94,6 @@ public: static void Load(uint8 *buf, uint32 size); static void Save(uint8 *buf, uint32 *size); - static bool TestForPickupsInBubble(CVector pos, float radius); - static CPickup aPickUps[NUMPICKUPS]; // unused diff --git a/src/peds/Ped.h b/src/peds/Ped.h index 32c54d5d..0e80c378 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -867,7 +867,6 @@ public: void SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float, float, int); void ClearWaitState(void); - void CreateDeadPedPickupCoors(float* x, float* y, float* z); bool HasWeaponSlot(uint8 slot) { return m_weapons[slot].m_eWeaponType != WEAPONTYPE_UNARMED; } CWeapon& GetWeapon(uint8 slot) { return m_weapons[slot]; }