diff options
| author | aap <aap@papnet.eu> | 2020-05-23 00:12:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-23 00:12:06 +0200 |
| commit | b105403dc75d6306be8a8b49d15cb889b3ad92d2 (patch) | |
| tree | f54f09c8a5f002d64ed81a2f6a7e9024d9028612 /src/objects/Object.cpp | |
| parent | Merge pull request #576 from Nick007J/miami (diff) | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| download | re3-b105403dc75d6306be8a8b49d15cb889b3ad92d2.tar re3-b105403dc75d6306be8a8b49d15cb889b3ad92d2.tar.gz re3-b105403dc75d6306be8a8b49d15cb889b3ad92d2.tar.bz2 re3-b105403dc75d6306be8a8b49d15cb889b3ad92d2.tar.lz re3-b105403dc75d6306be8a8b49d15cb889b3ad92d2.tar.xz re3-b105403dc75d6306be8a8b49d15cb889b3ad92d2.tar.zst re3-b105403dc75d6306be8a8b49d15cb889b3ad92d2.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; } |