diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-19 03:21:04 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-19 03:21:04 +0300 |
| commit | 8d1996833bd73271ca14a3df46633d9b2ed13052 (patch) | |
| tree | daedb1622096e5bb6b8b9ec15882769b827506e1 /src/control/Pickups.cpp | |
| parent | c17ccc50ab76e7f161af484400914db373dcafae (diff) | |
| parent | a080fbfbd41ac8a2bc6cfe053d4fa0932dd8d334 (diff) | |
merge attempt
Diffstat (limited to 'src/control/Pickups.cpp')
| -rw-r--r-- | src/control/Pickups.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index 8408356d..23b5d9ff 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -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)) { |