diff options
| author | aap <aap@papnet.eu> | 2020-05-20 12:41:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 12:41:12 +0200 |
| commit | fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b (patch) | |
| tree | b32e29a80a2bb4c4692ed6dccef9b8c5e7f81185 /src/objects/Object.cpp | |
| parent | Merge pull request #568 from Nick007J/miami (diff) | |
| parent | CEntity and friends (diff) | |
| download | re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.gz re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.bz2 re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.lz re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.xz re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.zst re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.zip | |
Diffstat (limited to 'src/objects/Object.cpp')
| -rw-r--r-- | src/objects/Object.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index 4a45050c..e6bb7aee 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -14,7 +14,8 @@ #include "soundlist.h" int16 CObject::nNoTempObjects; -int16 CObject::nBodyCastHealth = 1000; +//int16 CObject::nBodyCastHealth = 1000; +float CObject::fDistToNearestTree; void *CObject::operator new(size_t sz) { return CPools::GetObjectPool()->New(); } void *CObject::operator new(size_t sz, int handle) { return CPools::GetObjectPool()->New(handle);}; @@ -161,6 +162,7 @@ CObject::ObjectDamage(float amount) return; static int8 nFrameGen = 0; bool bBodyCastDamageEffect = false; +#if 0 if (GetModelIndex() == MI_BODYCAST) { if (amount > 50.0f) nBodyCastHealth = (int16)(nBodyCastHealth - 0.5f * amount); @@ -170,6 +172,7 @@ CObject::ObjectDamage(float amount) bBodyCastDamageEffect = true; amount = 0.0f; } +#endif if ((amount * m_fCollisionDamageMultiplier > 150.0f || bBodyCastDamageEffect) && m_nCollisionDamageEffect) { const CVector& vecPos = m_matrix.GetPosition(); const float fDirectionZ = 0.0002f * amount; @@ -335,9 +338,12 @@ CObject::Init(void) m_pCurSurface = outEntity; else m_pCurSurface = nil; +#if 0 if (GetModelIndex() == MI_BODYCAST) nBodyCastHealth = 1000; - else if (GetModelIndex() == MI_BUOY) + else +#endif + if (GetModelIndex() == MI_BUOY) bTouchingWater = true; } |