summaryrefslogtreecommitdiffstats
path: root/src/entities
diff options
context:
space:
mode:
author_AG <gennariarmando@outlook.com>2019-06-22 11:42:21 +0200
committer_AG <gennariarmando@outlook.com>2019-06-22 11:42:27 +0200
commitbeea41d465619ce39bdd36824c477b9690a619d5 (patch)
tree0595beed05d614ee4944d0f40ef81403902ca576 /src/entities
parentbla (diff)
downloadre3-beea41d465619ce39bdd36824c477b9690a619d5.tar
re3-beea41d465619ce39bdd36824c477b9690a619d5.tar.gz
re3-beea41d465619ce39bdd36824c477b9690a619d5.tar.bz2
re3-beea41d465619ce39bdd36824c477b9690a619d5.tar.lz
re3-beea41d465619ce39bdd36824c477b9690a619d5.tar.xz
re3-beea41d465619ce39bdd36824c477b9690a619d5.tar.zst
re3-beea41d465619ce39bdd36824c477b9690a619d5.zip
Diffstat (limited to '')
-rw-r--r--src/entities/CutsceneObject.cpp2
-rw-r--r--src/entities/Entity.cpp2
-rw-r--r--src/entities/Entity.h15
3 files changed, 16 insertions, 3 deletions
diff --git a/src/entities/CutsceneObject.cpp b/src/entities/CutsceneObject.cpp
index 1e665dd6..163d0513 100644
--- a/src/entities/CutsceneObject.cpp
+++ b/src/entities/CutsceneObject.cpp
@@ -74,7 +74,7 @@ CCutsceneObject::SetupLighting(void)
}else{
CVector coors = GetPosition();
float lighting = CPointLights::GenerateLightsAffectingObject(&coors);
- if(!m_flagB20 && lighting != 1.0f){
+ if(!bHasBlip && lighting != 1.0f){
SetAmbientAndDirectionalColours(lighting);
return true;
}
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index 0ab1488d..d2b2577d 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -31,7 +31,7 @@ CEntity::CEntity(void)
bIsVisible = true;
bHasCollided = false;
bRenderScorched = false;
- m_flagB20 = false;
+ bHasBlip = false;
bIsBIGBuilding = false;
bRenderDamaged = false;
diff --git a/src/entities/Entity.h b/src/entities/Entity.h
index 95294ed8..0ce47428 100644
--- a/src/entities/Entity.h
+++ b/src/entities/Entity.h
@@ -5,6 +5,19 @@
struct CReference;
+enum eEntityFlags
+{
+ IS_UNK = 0,
+ CONTROL_POSTPONED,
+ IS_EXPLOSIONPROOF,
+ IS_VISIBLE,
+ IS_ON_GROUND,
+ REQUIRES_SCORCHED_LIGHTS,
+ HAS_BLIP,
+ IS_BIG_BUILDING,
+ HAS_BEEN_DAMAGED,
+};
+
enum eEntityType
{
ENTITY_TYPE_NOTHING = 0,
@@ -59,7 +72,7 @@ public:
uint32 bIsVisible : 1;
uint32 bHasCollided : 1; //
uint32 bRenderScorched : 1;
- uint32 m_flagB20 : 1; // bFlashing?
+ uint32 bHasBlip : 1;
uint32 bIsBIGBuilding : 1;
// VC inserts one more flag here: if drawdist <= 2000
uint32 bRenderDamaged : 1;