summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-02-10 11:21:21 +0100
committerSergeanur <s.anureev@yandex.ua>2021-02-10 11:21:21 +0100
commitca85e44c9e6aa0a21a637179b3cea6be66e08edb (patch)
treefc7b462342198b8ee8afa349c0aa899ee2775221 /src/control
parentfix clouds (diff)
downloadre3-ca85e44c9e6aa0a21a637179b3cea6be66e08edb.tar
re3-ca85e44c9e6aa0a21a637179b3cea6be66e08edb.tar.gz
re3-ca85e44c9e6aa0a21a637179b3cea6be66e08edb.tar.bz2
re3-ca85e44c9e6aa0a21a637179b3cea6be66e08edb.tar.lz
re3-ca85e44c9e6aa0a21a637179b3cea6be66e08edb.tar.xz
re3-ca85e44c9e6aa0a21a637179b3cea6be66e08edb.tar.zst
re3-ca85e44c9e6aa0a21a637179b3cea6be66e08edb.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Pickups.cpp7
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;
}