summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-10-21 20:14:40 +0200
committerSergeanur <s.anureev@yandex.ua>2020-10-21 20:14:40 +0200
commit2709531f0901bf24136738e76b5427ddc16fdf7d (patch)
treedb731ac6324b6834d9f6ae36d5615e77cd7f2b20 /src
parentPickups Done (diff)
downloadre3-2709531f0901bf24136738e76b5427ddc16fdf7d.tar
re3-2709531f0901bf24136738e76b5427ddc16fdf7d.tar.gz
re3-2709531f0901bf24136738e76b5427ddc16fdf7d.tar.bz2
re3-2709531f0901bf24136738e76b5427ddc16fdf7d.tar.lz
re3-2709531f0901bf24136738e76b5427ddc16fdf7d.tar.xz
re3-2709531f0901bf24136738e76b5427ddc16fdf7d.tar.zst
re3-2709531f0901bf24136738e76b5427ddc16fdf7d.zip
Diffstat (limited to '')
-rw-r--r--src/control/Pickups.cpp6
-rw-r--r--src/objects/Object.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 19f128bc..8b8bc1a3 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -218,7 +218,7 @@ CPickup::GiveUsAPickUpObject(CObject **ppObject, CObject **ppExtraObject, int32
object->bExplosionProof = true;
object->bUsesCollision = false;
object->bIsPickup = true;
- object->obj_flag_02 = m_bWasAmmoCollected;
+ object->bAmmoCollected = m_bWasAmmoCollected;
object->bHasPreRenderEffects = true;
if (extraObject) {
@@ -232,7 +232,7 @@ CPickup::GiveUsAPickUpObject(CObject **ppObject, CObject **ppExtraObject, int32
extraObject->bExplosionProof = true;
extraObject->bUsesCollision = false;
extraObject->bIsPickup = true;
- extraObject->obj_flag_02 = true;
+ extraObject->bAmmoCollected = true;
extraObject->bHasPreRenderEffects = true;
extraObject->m_nBonusValue = 0;
extraObject->bPickupObjWithMessage = false;
@@ -1076,7 +1076,7 @@ CPickups::DoPickUpEffects(CEntity *entity)
else
corona2 = true;
- if (((CObject*)entity)->obj_flag_02) {
+ if (((CObject*)entity)->bAmmoCollected) {
corona2 = false;
corona1 = false;
}
diff --git a/src/objects/Object.h b/src/objects/Object.h
index ce45509f..bc74b58b 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -61,7 +61,7 @@ public:
float m_fUprootLimit;
int8 ObjectCreatedBy;
uint8 bIsPickup : 1;
- uint8 obj_flag_02 : 1;
+ uint8 bAmmoCollected : 1;
uint8 bPickupObjWithMessage : 1;
uint8 bOutOfStock : 1;
uint8 bGlassCracked : 1;