github.com/td512.re3
1
0
Fork 0
mirror of https://github.com/td512/re3.git synced 2026-03-02 10:06:50 +00:00
Code Issues Projects Releases Wiki Activity

merge attempt

Browse Source
This commit is contained in:
Nikolay Korolev
2020-12-19 03:21:04 +03:00
parent c17ccc50ab a080fbfbd4
commit 8d1996833b
68 changed files with 2149 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/control/Pickups.cpp
View File

@@ -596,7 +596,10 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
bool explode = false;
if (CTimer::GetTimeInMilliseconds() > m_nTimer)
explode = true;
else {// added else here since vehicle lookup is useless
#ifdef FIX_BUGS
else// added else here since vehicle lookup is useless
#endif
{
for (int32 i = CPools::GetVehiclePool()->GetSize()-1; i >= 0; i--) {
CVehicle *vehicle = CPools::GetVehiclePool()->GetSlot(i);
if (vehicle != nil && vehicle->IsSphereTouchingVehicle(m_pObject->GetPosition().x, m_pObject->GetPosition().y, m_pObject->GetPosition().z, 1.5f)) {