diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-19 16:38:48 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-19 16:38:48 +0200 |
| commit | df376a13ea8dac7ecff2aabe7d715774bcc7c294 (patch) | |
| tree | dc4c0230c14bce31044813c8dc4048a837c0c278 /src/objects | |
| parent | 1.1 patch stuff (diff) | |
| parent | Merge pull request #474 from Nick007J/master (diff) | |
| download | re3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.tar re3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.tar.gz re3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.tar.bz2 re3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.tar.lz re3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.tar.xz re3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.tar.zst re3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.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; |