diff options
| author | aap <aap@papnet.eu> | 2020-05-06 09:24:18 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-06 09:24:18 +0200 |
| commit | 8e84728f41aef0c01f0a7eaf2e074ee876712861 (patch) | |
| tree | 85484924e37a3afb3c4524cb89f72672a9b86d88 /src/entities | |
| parent | updated librw (diff) | |
| parent | Remove audio from premake (diff) | |
| download | re3-8e84728f41aef0c01f0a7eaf2e074ee876712861.tar re3-8e84728f41aef0c01f0a7eaf2e074ee876712861.tar.gz re3-8e84728f41aef0c01f0a7eaf2e074ee876712861.tar.bz2 re3-8e84728f41aef0c01f0a7eaf2e074ee876712861.tar.lz re3-8e84728f41aef0c01f0a7eaf2e074ee876712861.tar.xz re3-8e84728f41aef0c01f0a7eaf2e074ee876712861.tar.zst re3-8e84728f41aef0c01f0a7eaf2e074ee876712861.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/entities/Entity.cpp | 17 | ||||
| -rw-r--r-- | src/entities/Entity.h | 3 |
2 files changed, 0 insertions, 20 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index 7bacd421..e2b91552 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -60,10 +60,8 @@ CEntity::CEntity(void) bMeleeProof = false; bOnlyDamagedByPlayer = false; bStreamingDontDelete = false; -#ifdef GTA_ZONECULL bZoneCulled = false; bZoneCulled2 = false; -#endif bRemoveFromWorld = false; bHasHitWall = false; @@ -150,17 +148,6 @@ CEntity::GetIsOnScreenComplex(void) return TheCamera.IsBoxVisible(boundBox, &TheCamera.GetCameraMatrix()); } -bool -CEntity::GetIsOnScreenAndNotCulled(void) -{ -#ifdef GTA_ZONECULL - return GetIsOnScreen() && CRenderer::IsEntityCullZoneVisible(this); -#else - return GetIsOnScreen(); -#endif -} - - void CEntity::Add(void) { @@ -967,10 +954,8 @@ CEntity::SaveEntityFlags(uint8*& buf) if (bMeleeProof) tmp |= BIT(27); if (bOnlyDamagedByPlayer) tmp |= BIT(28); if (bStreamingDontDelete) tmp |= BIT(29); -#ifdef GTA_ZONECULL if (bZoneCulled) tmp |= BIT(30); if (bZoneCulled2) tmp |= BIT(31); -#endif WriteSaveBuf<uint32>(buf, tmp); @@ -1022,10 +1007,8 @@ CEntity::LoadEntityFlags(uint8*& buf) bMeleeProof = !!(tmp & BIT(27)); bOnlyDamagedByPlayer = !!(tmp & BIT(28)); bStreamingDontDelete = !!(tmp & BIT(29)); -#ifdef GTA_ZONECULL bZoneCulled = !!(tmp & BIT(30)); bZoneCulled2 = !!(tmp & BIT(31)); -#endif tmp = ReadSaveBuf<uint32>(buf); diff --git a/src/entities/Entity.h b/src/entities/Entity.h index 17353f97..7b1d4c07 100644 --- a/src/entities/Entity.h +++ b/src/entities/Entity.h @@ -68,10 +68,8 @@ 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 @@ -148,7 +146,6 @@ public: bool GetIsTouching(CVector const ¢er, 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; } |