diff options
| author | aap <aap@papnet.eu> | 2020-11-11 09:37:10 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-11-11 09:38:33 +0100 |
| commit | 48d0653331c8b1debc9d985131c9ea31a0e0c97f (patch) | |
| tree | aadeefe2bf09efd2dde21fefed5a8cf0ed553518 /src/control/Pickups.cpp | |
| parent | move stuff into define (diff) | |
| parent | Merge pull request #771 from theR4K/miamiDev (diff) | |
| download | re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.tar re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.tar.gz re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.tar.bz2 re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.tar.lz re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.tar.xz re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.tar.zst re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.zip | |
Diffstat (limited to 'src/control/Pickups.cpp')
| -rw-r--r-- | src/control/Pickups.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index 2a5863f1..7e7ef321 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -369,7 +369,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId) if (weaponType < WEAPONTYPE_TOTALWEAPONS && CDarkel::FrenzyOnGoing()) { isPickupTouched = false; m_bWasControlMessageShown = false; - } else if (weaponType != WEAPONTYPE_UNARMED) { + } else if (weaponType < WEAPONTYPE_TOTALWEAPONS && weaponType != WEAPONTYPE_UNARMED) { uint32 slot = CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot; eWeaponType plrWeaponSlot = FindPlayerPed()->GetWeapon(slot).m_eWeaponType; if (plrWeaponSlot != weaponType) { @@ -508,7 +508,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId) result = true; Remove(); DMAudio.PlayFrontEndSound(SOUND_PICKUP_HIDDEN_PACKAGE, 0); - return true; + break; case PICKUP_MONEY: CWorld::Players[playerId].m_nMoney += m_nQuantity; sprintf(gString, "$%d", m_nQuantity); @@ -518,12 +518,13 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId) result = true; Remove(); DMAudio.PlayFrontEndSound(SOUND_PICKUP_MONEY, 0); - return true; + player->Say(SOUND_PED_MUGGING); + break; case PICKUP_ASSET_REVENUE: CWorld::Players[CWorld::PlayerInFocus].m_nMoney += m_fRevenue; m_fRevenue = 0.0f; DMAudio.PlayFrontEndSound(SOUND_PICKUP_MONEY, 0); - return false; + break; case PICKUP_PROPERTY_LOCKED: if (!m_bWasControlMessageShown) { m_bWasControlMessageShown = true; |