diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 13:48:35 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 13:48:35 +0200 |
| commit | e9b334d7bf270682f83c5c18b2d85a25703c1a2d (patch) | |
| tree | baa7ed00dedd2b09f99a2bb4958d2837ef6a8da6 /src/objects/Object.cpp | |
| parent | SetPosition, final part (diff) | |
| download | re3-e9b334d7bf270682f83c5c18b2d85a25703c1a2d.tar re3-e9b334d7bf270682f83c5c18b2d85a25703c1a2d.tar.gz re3-e9b334d7bf270682f83c5c18b2d85a25703c1a2d.tar.bz2 re3-e9b334d7bf270682f83c5c18b2d85a25703c1a2d.tar.lz re3-e9b334d7bf270682f83c5c18b2d85a25703c1a2d.tar.xz re3-e9b334d7bf270682f83c5c18b2d85a25703c1a2d.tar.zst re3-e9b334d7bf270682f83c5c18b2d85a25703c1a2d.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/objects/Object.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index 1ae5e9b0..1587749d 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -57,7 +57,7 @@ CObject::CObject(int32 mi, bool createRW) CObject::CObject(CDummyObject *dummy) { - SetModelIndexNoCreate(dummy->m_modelIndex); + SetModelIndexNoCreate(dummy->GetModelIndex()); if (dummy->m_rwObject) AttachToRwObject(dummy->m_rwObject); @@ -97,7 +97,7 @@ CObject::ProcessControl(void) m_vecMoveSpeed *= fTimeStep; m_vecTurnSpeed *= fTimeStep; } - if ((m_modelIndex == MI_EXPLODINGBARREL || m_modelIndex == MI_PETROLPUMP) && bHasBeenDamaged && bIsVisible + if ((GetModelIndex() == MI_EXPLODINGBARREL || GetModelIndex() == MI_PETROLPUMP) && bHasBeenDamaged && bIsVisible && (CGeneral::GetRandomNumber() & 0x1F) == 10) { bExplosionProof = true; bIsVisible = false; @@ -159,7 +159,7 @@ CObject::ObjectDamage(float amount) return; static int8 nFrameGen = 0; bool bBodyCastDamageEffect = false; - if (m_modelIndex == MI_BODYCAST){ + if (GetModelIndex() == MI_BODYCAST) { if (amount > 50.0f) nBodyCastHealth = (int16)(nBodyCastHealth - 0.5f * amount); if (nBodyCastHealth < 0) @@ -310,7 +310,7 @@ void CObject::Init(void) { m_type = ENTITY_TYPE_OBJECT; - CObjectData::SetObjectData(m_modelIndex, *this); + CObjectData::SetObjectData(GetModelIndex(), *this); m_nEndOfLifeTime = 0; ObjectCreatedBy = GAME_OBJECT; bIsStatic = true; @@ -333,9 +333,9 @@ CObject::Init(void) m_pCurSurface = outEntity; else m_pCurSurface = nil; - if (m_modelIndex == MI_BODYCAST) + if (GetModelIndex() == MI_BODYCAST) nBodyCastHealth = 1000; - else if (m_modelIndex == MI_BUOY) + else if (GetModelIndex() == MI_BUOY) bTouchingWater = true; } |