a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 12:10:00 +00:00
Code Issues Projects Releases Wiki Activity

Rename CObject flag

Browse source
This commit is contained in:
Sergeanur 2020-10-21 21:14:40 +03:00
parent e9a89236a2
commit 2709531f09
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/control/Pickups.cpp
View file

@ -218,7 +218,7 @@ CPickup::GiveUsAPickUpObject(CObject **ppObject, CObject **ppExtraObject, int32
object->bExplosionProof = true; object->bExplosionProof = true;
object->bUsesCollision = false; object->bUsesCollision = false;
object->bIsPickup = true; object->bIsPickup = true;
object->obj_flag_02 = m_bWasAmmoCollected; object->bAmmoCollected = m_bWasAmmoCollected;
object->bHasPreRenderEffects = true; object->bHasPreRenderEffects = true;
if (extraObject) { if (extraObject) {
@ -232,7 +232,7 @@ CPickup::GiveUsAPickUpObject(CObject **ppObject, CObject **ppExtraObject, int32
extraObject->bExplosionProof = true; extraObject->bExplosionProof = true;
extraObject->bUsesCollision = false; extraObject->bUsesCollision = false;
extraObject->bIsPickup = true; extraObject->bIsPickup = true;
extraObject->obj_flag_02 = true; extraObject->bAmmoCollected = true;
extraObject->bHasPreRenderEffects = true; extraObject->bHasPreRenderEffects = true;
extraObject->m_nBonusValue = 0; extraObject->m_nBonusValue = 0;
extraObject->bPickupObjWithMessage = false; extraObject->bPickupObjWithMessage = false;
@ -1076,7 +1076,7 @@ CPickups::DoPickUpEffects(CEntity *entity)
else else
corona2 = true; corona2 = true;
if (((CObject*)entity)->obj_flag_02) { if (((CObject*)entity)->bAmmoCollected) {
corona2 = false; corona2 = false;
corona1 = false; corona1 = false;
} }

2
src/objects/Object.h
View file

@ -61,7 +61,7 @@ public:
float m_fUprootLimit; float m_fUprootLimit;
int8 ObjectCreatedBy; int8 ObjectCreatedBy;
uint8 bIsPickup : 1; uint8 bIsPickup : 1;
uint8 obj_flag_02 : 1; uint8 bAmmoCollected : 1;
uint8 bPickupObjWithMessage : 1; uint8 bPickupObjWithMessage : 1;
uint8 bOutOfStock : 1; uint8 bOutOfStock : 1;
uint8 bGlassCracked : 1; uint8 bGlassCracked : 1;