diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-02-10 11:22:12 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-02-10 11:22:12 +0100 |
| commit | 5072c8b6f08464a3e13cfd6a36a4b6dcbad3c4ac (patch) | |
| tree | 1008cb0f0d761f741b9021be6f4a7168a2ef8f20 /src | |
| parent | Save vibration setting (diff) | |
| parent | Fix repeating pickup sound on revenue pickup (diff) | |
| download | re3-5072c8b6f08464a3e13cfd6a36a4b6dcbad3c4ac.tar re3-5072c8b6f08464a3e13cfd6a36a4b6dcbad3c4ac.tar.gz re3-5072c8b6f08464a3e13cfd6a36a4b6dcbad3c4ac.tar.bz2 re3-5072c8b6f08464a3e13cfd6a36a4b6dcbad3c4ac.tar.lz re3-5072c8b6f08464a3e13cfd6a36a4b6dcbad3c4ac.tar.xz re3-5072c8b6f08464a3e13cfd6a36a4b6dcbad3c4ac.tar.zst re3-5072c8b6f08464a3e13cfd6a36a4b6dcbad3c4ac.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/control/Pickups.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index 67e658c6..7bc88321 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -274,10 +274,11 @@ CPickup::CanBePickedUp(CPlayerPed *player, int playerId) { assert(m_pObject != nil); bool cannotBePickedUp = - (m_pObject->GetModelIndex() == MI_PICKUP_BODYARMOUR && player->m_fArmour > CWorld::Players[playerId].m_nMaxArmour - 0.5f) - || (m_pObject->GetModelIndex() == MI_PICKUP_HEALTH && player->m_fHealth > CWorld::Players[playerId].m_nMaxHealth - 0.5f) + (m_pObject->GetModelIndex() == MI_PICKUP_BODYARMOUR && player->m_fArmour > CWorld::Players[playerId].m_nMaxArmour - 0.2f) + || (m_pObject->GetModelIndex() == MI_PICKUP_HEALTH && player->m_fHealth > CWorld::Players[playerId].m_nMaxHealth - 0.2f) || (m_pObject->GetModelIndex() == MI_PICKUP_BRIBE && player->m_pWanted->GetWantedLevel() == 0) - || (m_pObject->GetModelIndex() == MI_PICKUP_KILLFRENZY && (CTheScripts::IsPlayerOnAMission() || CDarkel::FrenzyOnGoing() || !CGame::nastyGame)); + || (m_pObject->GetModelIndex() == MI_PICKUP_KILLFRENZY && (CTheScripts::IsPlayerOnAMission() || CDarkel::FrenzyOnGoing() || !CGame::nastyGame)) + || (m_eType == PICKUP_ASSET_REVENUE && m_fRevenue < 10.0f); return !cannotBePickedUp; } |