diff options
| author | aap <aap@papnet.eu> | 2020-05-20 19:55:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 19:55:05 +0200 |
| commit | 71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3 (patch) | |
| tree | bcdf3151eaab37430d9aeac886a55acbe7f65ccd /src/objects | |
| parent | Merge remote-tracking branch 'origin/master' into miami (diff) | |
| parent | Fixes for melees and various things (diff) | |
| download | re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.tar re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.tar.gz re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.tar.bz2 re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.tar.lz re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.tar.xz re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.tar.zst re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.zip | |
Diffstat (limited to 'src/objects')
| -rw-r--r-- | src/objects/Object.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index e6bb7aee..fd5a2aa3 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -338,13 +338,13 @@ CObject::Init(void) m_pCurSurface = outEntity; else m_pCurSurface = nil; -#if 0 - if (GetModelIndex() == MI_BODYCAST) - nBodyCastHealth = 1000; - else -#endif + if (GetModelIndex() == MI_BUOY) bTouchingWater = true; + + // TODO(Miami): Second flag set initialization + + m_area = AREA_EVERYWHERE; } bool |