diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-06 18:32:57 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-06 18:32:57 +0200 |
| commit | 6ad66fb2d78360053febb3369a7ec448ffec73fd (patch) | |
| tree | 6c0f21a5f8ecc2cb7facd55f3944b65c1c3a6d0e /src/core | |
| parent | CSphere and CBox for CColModel (diff) | |
| parent | Merge pull request #517 from Nick007J/master (diff) | |
| download | re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.tar re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.tar.gz re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.tar.bz2 re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.tar.lz re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.tar.xz re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.tar.zst re3-6ad66fb2d78360053febb3369a7ec448ffec73fd.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/World.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp index 37ad6221..29505481 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -75,7 +75,7 @@ CWorld::Add(CEntity *ent) if(ent->IsBuilding() || ent->IsDummy()) return; - if(!ent->bIsStatic) ((CPhysical *)ent)->AddToMovingList(); + if(!ent->IsStatic()) ((CPhysical *)ent)->AddToMovingList(); } void @@ -90,7 +90,7 @@ CWorld::Remove(CEntity *ent) if(ent->IsBuilding() || ent->IsDummy()) return; - if(!ent->bIsStatic) ((CPhysical *)ent)->RemoveFromMovingList(); + if(!ent->IsStatic()) ((CPhysical *)ent)->RemoveFromMovingList(); } void @@ -1953,7 +1953,7 @@ CWorld::Process(void) RemoveEntityInsteadOfProcessingIt(movingEnt); } else { movingEnt->ProcessControl(); - if(movingEnt->bIsStatic) { movingEnt->RemoveFromMovingList(); } + if(movingEnt->IsStatic()) { movingEnt->RemoveFromMovingList(); } } } bForceProcessControl = true; @@ -1964,7 +1964,7 @@ CWorld::Process(void) RemoveEntityInsteadOfProcessingIt(movingEnt); } else { movingEnt->ProcessControl(); - if(movingEnt->bIsStatic) { movingEnt->RemoveFromMovingList(); } + if(movingEnt->IsStatic()) { movingEnt->RemoveFromMovingList(); } } } } @@ -2117,7 +2117,7 @@ CWorld::TriggerExplosionSectorList(CPtrList &list, const CVector &position, floa CObject *pObject = (CObject *)pEntity; CVehicle *pVehicle = (CVehicle *)pEntity; if(!pEntity->bExplosionProof && (!pEntity->IsPed() || !pPed->bInVehicle)) { - if(pEntity->bIsStatic) { + if(pEntity->IsStatic()) { if(pEntity->IsObject()) { if (fPower > pObject->m_fUprootLimit || IsFence(pObject->GetModelIndex())) { if (IsGlass(pObject->GetModelIndex())) { @@ -2141,7 +2141,7 @@ CWorld::TriggerExplosionSectorList(CPtrList &list, const CVector &position, floa } } } - if(pEntity->bIsStatic) { + if(pEntity->IsStatic()) { float fDamageMultiplier = (fRadius - fMagnitude) * 2.0f / fRadius; float fDamage = 300.0f * Min(fDamageMultiplier, 1.0f); @@ -2152,7 +2152,7 @@ CWorld::TriggerExplosionSectorList(CPtrList &list, const CVector &position, floa pEntity->AddToMovingList(); } } - if(!pEntity->bIsStatic) { + if(!pEntity->IsStatic()) { float fDamageMultiplier = Min((fRadius - fMagnitude) * 2.0f / fRadius, 1.0f); CVector vecForceDir = vecDistance * (fPower * pEntity->m_fMass * 0.00071429f * fDamageMultiplier / |