a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-05 10:35:54 +00:00
Code Issues Projects Releases Wiki Activity

sync with upstream

Browse source
This commit is contained in:
Nikolay Korolev 2020-05-17 21:48:21 +03:00
parent 3cc20d7962
commit d5d2f6a822
3 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/control/Pickups.cpp
View file

@ -1458,13 +1458,3 @@ CPacManPickups::ResetPowerPillsCarriedByPlayer()
FindPlayerVehicle()->m_fForceMultiplier = 1.0f; 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;
}

2
src/control/Pickups.h
View file

@ -94,8 +94,6 @@ public:
static void Load(uint8 *buf, uint32 size); static void Load(uint8 *buf, uint32 size);
static void Save(uint8 *buf, uint32 *size); static void Save(uint8 *buf, uint32 *size);
static bool TestForPickupsInBubble(CVector pos, float radius);
static CPickup aPickUps[NUMPICKUPS]; static CPickup aPickUps[NUMPICKUPS];
// unused // unused

1
src/peds/Ped.h
View file

@ -867,7 +867,6 @@ public:
void SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float, float, int); void SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float, float, int);
void ClearWaitState(void); void ClearWaitState(void);
void CreateDeadPedPickupCoors(float* x, float* y, float* z);
bool HasWeaponSlot(uint8 slot) { return m_weapons[slot].m_eWeaponType != WEAPONTYPE_UNARMED; } bool HasWeaponSlot(uint8 slot) { return m_weapons[slot].m_eWeaponType != WEAPONTYPE_UNARMED; }
CWeapon& GetWeapon(uint8 slot) { return m_weapons[slot]; } CWeapon& GetWeapon(uint8 slot) { return m_weapons[slot]; }