From a24b65cbde23929c388e0c207b804a87346a9592 Mon Sep 17 00:00:00 2001
From: Nikolay Korolev <nickvnuk@gmail.com>
Date: Wed, 6 May 2020 19:17:47 +0300
Subject: IsStatic

---
 src/core/World.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/core/World.cpp')

diff --git a/src/core/World.cpp b/src/core/World.cpp
index 15330923..c884f1ed 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
@@ -1951,7 +1951,7 @@ CWorld::Process(void)
 				RemoveEntityInsteadOfProcessingIt(movingEnt);
 			} else {
 				movingEnt->ProcessControl();
-				if(movingEnt->bIsStatic) { movingEnt->RemoveFromMovingList(); }
+				if(movingEnt->IsStatic()) { movingEnt->RemoveFromMovingList(); }
 			}
 		}
 		bForceProcessControl = true;
@@ -1962,7 +1962,7 @@ CWorld::Process(void)
 					RemoveEntityInsteadOfProcessingIt(movingEnt);
 				} else {
 					movingEnt->ProcessControl();
-					if(movingEnt->bIsStatic) { movingEnt->RemoveFromMovingList(); }
+					if(movingEnt->IsStatic()) { movingEnt->RemoveFromMovingList(); }
 				}
 			}
 		}
@@ -2115,7 +2115,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())) {
@@ -2139,7 +2139,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);
@@ -2150,7 +2150,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 /
-- 
cgit v1.2.3