archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-03 07:10:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30 from gennariarmando/master

Browse Source 
More CRadar stuff.
This commit is contained in:
aap
2019-06-22 21:30:43 +02:00
committed by GitHub
parent 7a77f995b2 beea41d465
commit 69dd259b70
5 changed files with 142 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/entities/CutsceneObject.cpp
View File

@ -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;
}

2
src/entities/Entity.cpp
View File

@ -31,7 +31,7 @@ CEntity::CEntity(void)
bIsVisible = true;
bHasCollided = false;
bRenderScorched = false;
m_flagB20 = false;
bHasBlip = false;
bIsBIGBuilding = false;
bRenderDamaged = false;

15
src/entities/Entity.h
View File

@ -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;