summaryrefslogtreecommitdiffstats
path: root/src/control/Pickups.cpp
diff options
context:
space:
mode:
authorNikolay <nickvnuk@gmail.com>2021-08-31 22:16:52 +0200
committerGitHub <noreply@github.com>2021-08-31 22:16:52 +0200
commit9bd80324d1ff3f221304a7dde98358d9895926c2 (patch)
tree7f2b08583a71f159faa69b4254b54e4fac55174c /src/control/Pickups.cpp
parentBridge sound done (diff)
parentfix compile (diff)
downloadre3-9bd80324d1ff3f221304a7dde98358d9895926c2.tar
re3-9bd80324d1ff3f221304a7dde98358d9895926c2.tar.gz
re3-9bd80324d1ff3f221304a7dde98358d9895926c2.tar.bz2
re3-9bd80324d1ff3f221304a7dde98358d9895926c2.tar.lz
re3-9bd80324d1ff3f221304a7dde98358d9895926c2.tar.xz
re3-9bd80324d1ff3f221304a7dde98358d9895926c2.tar.zst
re3-9bd80324d1ff3f221304a7dde98358d9895926c2.zip
Diffstat (limited to 'src/control/Pickups.cpp')
-rw-r--r--src/control/Pickups.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index f31d89b3..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;
}