Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL"

Browse Source 
This reverts commit 1eb817de77.

# Conflicts:
#	src/core/Game.cpp
This commit is contained in:
Sergeanur
2020-05-05 18:34:46 +03:00
parent 12fbf8cede
commit 22e8b0e419
15 changed files with 126 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/entities/Entity.h
View File

@@ -71,8 +71,10 @@ public:
uint32 bMeleeProof : 1;
uint32 bOnlyDamagedByPlayer : 1;
uint32 bStreamingDontDelete : 1; // Dont let the streaming remove this
#ifdef GTA_ZONECULL
uint32 bZoneCulled : 1;
uint32 bZoneCulled2 : 1; // only treadables+10m
#endif
// flagsD
uint32 bRemoveFromWorld : 1; // remove this entity next time it should be processed
@@ -154,6 +156,7 @@ public:
bool GetIsTouching(CVector const &center, float r);
bool GetIsOnScreen(void);
bool GetIsOnScreenComplex(void);
bool GetIsOnScreenAndNotCulled(void);
bool IsVisible(void) { return m_rwObject && bIsVisible && GetIsOnScreen(); }
bool IsVisibleComplex(void) { return m_rwObject && bIsVisible && GetIsOnScreenComplex(); }
int16 GetModelIndex(void) const { return m_modelIndex; }