summaryrefslogtreecommitdiffstats
path: root/src/control/Pickups.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-04-19 06:14:13 +0200
committereray orçunus <erayorcunus@gmail.com>2020-04-19 15:44:35 +0200
commit1ffc37735ed247eef1f20997a0136ef8d866ebad (patch)
treea6a4689c7aeed054e397c305333f761d0d4acdd1 /src/control/Pickups.cpp
parentslider fix (diff)
downloadre3-1ffc37735ed247eef1f20997a0136ef8d866ebad.tar
re3-1ffc37735ed247eef1f20997a0136ef8d866ebad.tar.gz
re3-1ffc37735ed247eef1f20997a0136ef8d866ebad.tar.bz2
re3-1ffc37735ed247eef1f20997a0136ef8d866ebad.tar.lz
re3-1ffc37735ed247eef1f20997a0136ef8d866ebad.tar.xz
re3-1ffc37735ed247eef1f20997a0136ef8d866ebad.tar.zst
re3-1ffc37735ed247eef1f20997a0136ef8d866ebad.zip
Diffstat (limited to '')
-rw-r--r--src/control/Pickups.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 9836c9c2..f9605ca6 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -99,7 +99,7 @@ CPickup::GiveUsAPickUpObject(int32 handle)
switch (m_eType)
{
case PICKUP_IN_SHOP:
- object->m_obj_flag2 = true;
+ object->bPickupObjWithMessage = true;
object->bOutOfStock = false;
break;
case PICKUP_ON_STREET:
@@ -113,11 +113,11 @@ CPickup::GiveUsAPickUpObject(int32 handle)
case PICKUP_NAUTICAL_MINE_ARMED:
case PICKUP_FLOATINGPACKAGE:
case PICKUP_ON_STREET_SLOW:
- object->m_obj_flag2 = false;
+ object->bPickupObjWithMessage = false;
object->bOutOfStock = false;
break;
case PICKUP_IN_SHOP_OUT_OF_STOCK:
- object->m_obj_flag2 = false;
+ object->bPickupObjWithMessage = false;
object->bOutOfStock = true;
object->bRenderScorched = true;
break;
@@ -690,7 +690,7 @@ CPickups::DoPickUpEffects(CEntity *entity)
size, 65.0f, CCoronas::TYPE_RING, CCoronas::FLARE_NONE, CCoronas::REFLECTION_OFF, CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, 0.0f);
CObject *object = (CObject*)entity;
- if (object->m_obj_flag2 || object->bOutOfStock || object->m_nBonusValue) {
+ if (object->bPickupObjWithMessage || object->bOutOfStock || object->m_nBonusValue) {
float dist = (TheCamera.GetPosition() - pos).Magnitude();
const float MAXDIST = 12.0f;