diff options
Diffstat (limited to 'src/control/Pickups.cpp')
| -rw-r--r-- | src/control/Pickups.cpp | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index f6b1a9b9..020083cf 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -709,8 +709,10 @@ bool CPickups::TestForPickupsInBubble(CVector pos, float range) { for (int i = 0; i < NUMPICKUPS; i++) { - if ((aPickUps[i].m_vecPos - pos).Magnitude() < range) - return true; + if (aPickUps[i].m_eType != PICKUP_NONE) { + if ((aPickUps[i].m_vecPos - pos).Magnitude() < range) + return true; + } } return false; } @@ -1739,4 +1741,20 @@ CPed::CreateDeadPedPickupCoors(float *x, float *y, float *z) *y = GetPosition().y; *z = GetPosition().z + 0.4f; #undef NUMBER_OF_ATTEMPTS -}
\ No newline at end of file +} + +float CPickups::GetValue(int index) +{ + int i = GetActualPickupIndex(index); + if (i == -1) + return 0.0f; + return aPickUps[i].m_fRevenue; +} + +void CPickups::SetValue(int index, float value) +{ + int i = GetActualPickupIndex(index); + if (i == -1) + return; + aPickUps[i].m_fRevenue = value; +} |