summaryrefslogtreecommitdiffstats
path: root/src/control/Pickups.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-01-22 10:33:55 +0100
committerGitHub <noreply@github.com>2021-01-22 10:33:55 +0100
commit4acc9b08a2179ebf2a12e52759f7b4193c047533 (patch)
tree5adc99bd4296a54cc49354b291876603a72eed6e /src/control/Pickups.cpp
parentfuck (diff)
parentm_nWantedLevel -> GetWantedLevel() (diff)
downloadre3-4acc9b08a2179ebf2a12e52759f7b4193c047533.tar
re3-4acc9b08a2179ebf2a12e52759f7b4193c047533.tar.gz
re3-4acc9b08a2179ebf2a12e52759f7b4193c047533.tar.bz2
re3-4acc9b08a2179ebf2a12e52759f7b4193c047533.tar.lz
re3-4acc9b08a2179ebf2a12e52759f7b4193c047533.tar.xz
re3-4acc9b08a2179ebf2a12e52759f7b4193c047533.tar.zst
re3-4acc9b08a2179ebf2a12e52759f7b4193c047533.zip
Diffstat (limited to 'src/control/Pickups.cpp')
-rw-r--r--src/control/Pickups.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 5186a8d2..8c9d1031 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -278,7 +278,7 @@ CPickup::CanBePickedUp(CPlayerPed *player, int playerId)
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_BRIBE && player->m_pWanted->m_nWantedLevel == 0)
+ || (m_pObject->GetModelIndex() == MI_PICKUP_BRIBE && player->m_pWanted->GetWantedLevel() == 0)
|| (m_pObject->GetModelIndex() == MI_PICKUP_KILLFRENZY && (CTheScripts::IsPlayerOnAMission() || CDarkel::FrenzyOnGoing() || !CGame::nastyGame));
return !cannotBePickedUp;
}
@@ -784,7 +784,7 @@ CPickups::GivePlayerGoodiesWithPickUpMI(int16 modelIndex, int playerIndex)
DMAudio.PlayFrontEndSound(SOUND_PICKUP_BONUS, 0);
return true;
} else if (modelIndex == MI_PICKUP_BRIBE) {
- int32 level = Max(FindPlayerPed()->m_pWanted->m_nWantedLevel - 1, 0);
+ int32 level = Max(FindPlayerPed()->m_pWanted->GetWantedLevel() - 1, 0);
player->SetWantedLevel(level);
DMAudio.PlayFrontEndSound(SOUND_PICKUP_BONUS, 0);
return true;