diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2019-10-16 23:53:25 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2019-10-16 23:53:25 +0200 |
| commit | 5b1ffb09124c7427b7efb421091179ddecc725c4 (patch) | |
| tree | ac2d216a9aa6b79359371fe73b400c44fc5bca6e /src/control/Pickups.cpp | |
| parent | Merge pull request #244 from Nick007J/master (diff) | |
| download | re3-5b1ffb09124c7427b7efb421091179ddecc725c4.tar re3-5b1ffb09124c7427b7efb421091179ddecc725c4.tar.gz re3-5b1ffb09124c7427b7efb421091179ddecc725c4.tar.bz2 re3-5b1ffb09124c7427b7efb421091179ddecc725c4.tar.lz re3-5b1ffb09124c7427b7efb421091179ddecc725c4.tar.xz re3-5b1ffb09124c7427b7efb421091179ddecc725c4.tar.zst re3-5b1ffb09124c7427b7efb421091179ddecc725c4.zip | |
Diffstat (limited to 'src/control/Pickups.cpp')
| -rw-r--r-- | src/control/Pickups.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index 3ba01e46..c1a85af4 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -296,7 +296,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId) m_pObject->UpdateRwFrame();
bool touched = false;
- for (int32 i = CPools::GetVehiclePool()->GetSize(); i > 0; i--) { // TODO: check if i > 0 is not a R* mistake
+ 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)) {
touched = true;
@@ -323,7 +323,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId) if (CTimer::GetTimeInMilliseconds() > m_nTimer)
explode = true;
else {// added else here since vehicle lookup is useless
- for (int32 i = CPools::GetVehiclePool()->GetSize(); i > 0; i--) { // TODO: check if i > 0 is not a R* mistake
+ 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)) {
explode = true;
|