diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-23 00:43:17 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-23 00:43:17 +0200 |
| commit | b9115b4429565f45c2391c02dd860f47166df6f8 (patch) | |
| tree | 45963cc3390b1305b996e1eea2a1e953a217a82c /src/objects/Object.cpp | |
| parent | some fixes (diff) | |
| parent | Merge pull request #578 from aap/miami (diff) | |
| download | re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.gz re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.bz2 re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.lz re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.xz re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.zst re3-b9115b4429565f45c2391c02dd860f47166df6f8.zip | |
Diffstat (limited to 'src/objects/Object.cpp')
| -rw-r--r-- | src/objects/Object.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index fd5a2aa3..daa48d98 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -330,6 +330,8 @@ CObject::Init(void) m_colour1 = 0; m_colour2 = 0; m_nBonusValue = 0; + bIsWeapon = false; +// TODO(MIAMI): some new field here m_pCollidingEntity = nil; CColPoint point; CEntity* outEntity = nil; @@ -342,7 +344,9 @@ CObject::Init(void) if (GetModelIndex() == MI_BUOY) bTouchingWater = true; - // TODO(Miami): Second flag set initialization + if(CModelInfo::GetModelInfo(GetModelIndex())->GetModelType() == MITYPE_WEAPON) + bIsWeapon = true; + bIsStreetLight = IsLightObject(GetModelIndex()); m_area = AREA_EVERYWHERE; } |