From f6c767d87c5cb04710fb7e2363706d07dfcef8a6 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Thu, 27 Jun 2019 14:17:42 +0200
Subject: CStreaming almost done

---
 src/entities/CutsceneObject.cpp |  2 +-
 src/entities/Entity.cpp         | 18 +++++++++---------
 src/entities/Entity.h           | 16 ++++++++--------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/entities')

diff --git a/src/entities/CutsceneObject.cpp b/src/entities/CutsceneObject.cpp
index 163d0513..a7bca122 100644
--- a/src/entities/CutsceneObject.cpp
+++ b/src/entities/CutsceneObject.cpp
@@ -15,7 +15,7 @@ CCutsceneObject::CCutsceneObject(void)
 {
 	m_status = STATUS_SIMPLE;
 	bUsesCollision = false;
-	m_flagC20 = true;
+	bStreamingDontDelete = true;
 	ObjectCreatedBy = CUTSCENE_OBJECT;
 	m_fMass = 1.0f;
 	m_fTurnMass = 1.0f;
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index 294518c8..e9b35cd5 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -35,14 +35,14 @@ CEntity::CEntity(void)
 	bIsBIGBuilding = false;
 	bRenderDamaged = false;
 
-	m_flagC1 = false;
-	m_flagC2 = false;
-	m_flagC4 = false;
-	m_flagC8 = false;
-	m_flagC10 = false;
-	m_flagC20 = false;
-	m_bZoneCulled = false;
-	m_bZoneCulled2 = false;
+	bBulletProof = false;
+	bFireProof = false;
+	bCollisionProof = false;
+	bMeleeProof = false;
+	bOnlyDamagedByPlayer = false;
+	bStreamingDontDelete = false;
+	bZoneCulled = false;
+	bZoneCulled2 = false;
 
 	bRemoveFromWorld = false;
 	bHasHitWall = false;
@@ -305,7 +305,7 @@ CEntity::SetupBigBuilding(void)
 
 	mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(m_modelIndex);
 	bIsBIGBuilding = true;
-	m_flagC20 = true;
+	bStreamingDontDelete = true;
 	bUsesCollision = false;
 	m_level = CTheZones::GetLevelFromPosition(GetPosition());
 	if(m_level == LEVEL_NONE){
diff --git a/src/entities/Entity.h b/src/entities/Entity.h
index 8816e206..27dd8c14 100644
--- a/src/entities/Entity.h
+++ b/src/entities/Entity.h
@@ -78,14 +78,14 @@ public:
 	uint32 bRenderDamaged : 1;
 
 	// flagsC
-	uint32 m_flagC1 : 1;	// bullet proof?
-	uint32 m_flagC2 : 1;	// fire proof?
-	uint32 m_flagC4 : 1;	// collision proof?
-	uint32 m_flagC8 : 1;	// melee proof?
-	uint32 m_flagC10 : 1;	// bOnlyDamagedByPlayer?
-	uint32 m_flagC20 : 1;
-	uint32 m_bZoneCulled : 1;
-	uint32 m_bZoneCulled2 : 1;	// only treadables+10m
+	uint32 bBulletProof : 1;
+	uint32 bFireProof : 1;
+	uint32 bCollisionProof : 1;
+	uint32 bMeleeProof : 1;
+	uint32 bOnlyDamagedByPlayer : 1;
+	uint32 bStreamingDontDelete : 1;
+	uint32 bZoneCulled : 1;
+	uint32 bZoneCulled2 : 1;	// only treadables+10m
 
 	// flagsD
 	uint32 bRemoveFromWorld : 1;
-- 
cgit v1.2.3