diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-02 00:18:38 +0100 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-02 00:18:38 +0100 |
commit | c0ca3c7a3eb4a565111d789b3d9f5cc1f794a788 (patch) | |
tree | f6ffd5c74960bac9b0e900f1f3f775eec21947f9 /src/control/Pickups.cpp | |
parent | Merge remote-tracking branch 'upstream/master' (diff) | |
parent | Remove ifndef GTA_PS2 around replays (diff) | |
download | re3-c0ca3c7a3eb4a565111d789b3d9f5cc1f794a788.tar re3-c0ca3c7a3eb4a565111d789b3d9f5cc1f794a788.tar.gz re3-c0ca3c7a3eb4a565111d789b3d9f5cc1f794a788.tar.bz2 re3-c0ca3c7a3eb4a565111d789b3d9f5cc1f794a788.tar.lz re3-c0ca3c7a3eb4a565111d789b3d9f5cc1f794a788.tar.xz re3-c0ca3c7a3eb4a565111d789b3d9f5cc1f794a788.tar.zst re3-c0ca3c7a3eb4a565111d789b3d9f5cc1f794a788.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 2503f5c8..1b1c8cbc 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -353,11 +353,11 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId) m_pObject->GetMatrix().UpdateRW(); m_pObject->UpdateRwFrame(); - if (CWaterLevel::GetWaterLevel(m_pObject->GetPosition().x, m_pObject->GetPosition().y, m_pObject->GetPosition().z + 5.0f, &waterLevel, 0) && waterLevel >= m_pObject->GetPosition().z) + if (CWaterLevel::GetWaterLevel(m_pObject->GetPosition().x, m_pObject->GetPosition().y, m_pObject->GetPosition().z + 5.0f, &waterLevel, false) && waterLevel >= m_pObject->GetPosition().z) m_eType = PICKUP_FLOATINGPACKAGE_FLOATING; break; case PICKUP_FLOATINGPACKAGE_FLOATING: - if (CWaterLevel::GetWaterLevel(m_pObject->GetPosition().x, m_pObject->GetPosition().y, m_pObject->GetPosition().z + 5.0f, &waterLevel, 0)) + if (CWaterLevel::GetWaterLevel(m_pObject->GetPosition().x, m_pObject->GetPosition().y, m_pObject->GetPosition().z + 5.0f, &waterLevel, false)) m_pObject->GetMatrix().GetPosition().z = waterLevel; m_pObject->GetMatrix().UpdateRW(); |