diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-04-19 06:14:13 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-04-19 15:44:35 +0200 |
| commit | 1ffc37735ed247eef1f20997a0136ef8d866ebad (patch) | |
| tree | a6a4689c7aeed054e397c305333f761d0d4acdd1 /src/objects | |
| parent | slider fix (diff) | |
| download | re3-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 'src/objects')
| -rw-r--r-- | src/objects/Object.cpp | 4 | ||||
| -rw-r--r-- | src/objects/Object.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index 8968c117..d03dd405 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -35,7 +35,7 @@ CObject::CObject(void) m_colour1 = m_colour2; m_nBonusValue = 0; bIsPickup = false; - m_obj_flag2 = false; + bPickupObjWithMessage = false; bOutOfStock = false; bGlassCracked = false; bGlassBroken = false; @@ -315,7 +315,7 @@ CObject::Init(void) ObjectCreatedBy = GAME_OBJECT; bIsStatic = true; bIsPickup = false; - m_obj_flag2 = false; + bPickupObjWithMessage = false; bOutOfStock = false; bGlassCracked = false; bGlassBroken = false; diff --git a/src/objects/Object.h b/src/objects/Object.h index 081c285a..319ec4bc 100644 --- a/src/objects/Object.h +++ b/src/objects/Object.h @@ -47,13 +47,12 @@ public: float m_fUprootLimit; int8 ObjectCreatedBy; int8 bIsPickup : 1; - int8 m_obj_flag2 : 1; + int8 bPickupObjWithMessage : 1; int8 bOutOfStock : 1; int8 bGlassCracked : 1; int8 bGlassBroken : 1; int8 bHasBeenDamaged : 1; int8 bUseVehicleColours : 1; - int8 m_obj_flag80 : 1; int8 m_nBonusValue; float m_fCollisionDamageMultiplier; uint8 m_nCollisionDamageEffect; |