diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:33:32 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:33:32 +0200 |
| commit | 12fbf8ceded75438d1c5ac532f83319405fbb02d (patch) | |
| tree | 2062de5cd1582676c62ed4f8673eaa5d7ba8a2e4 /src/entities | |
| parent | Merge pull request #514 from Nick007J/miami (diff) | |
| parent | Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL (diff) | |
| download | re3-12fbf8ceded75438d1c5ac532f83319405fbb02d.tar re3-12fbf8ceded75438d1c5ac532f83319405fbb02d.tar.gz re3-12fbf8ceded75438d1c5ac532f83319405fbb02d.tar.bz2 re3-12fbf8ceded75438d1c5ac532f83319405fbb02d.tar.lz re3-12fbf8ceded75438d1c5ac532f83319405fbb02d.tar.xz re3-12fbf8ceded75438d1c5ac532f83319405fbb02d.tar.zst re3-12fbf8ceded75438d1c5ac532f83319405fbb02d.zip | |
Diffstat (limited to 'src/entities')
| -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 955f32a8..1f85015e 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -63,10 +63,8 @@ CEntity::CEntity(void) bMeleeProof = false; bOnlyDamagedByPlayer = false; bStreamingDontDelete = false; -#ifdef GTA_ZONECULL bZoneCulled = false; bZoneCulled2 = false; -#endif bRemoveFromWorld = false; bHasHitWall = false; @@ -153,17 +151,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) { @@ -975,10 +962,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); @@ -1030,10 +1015,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 49c6932c..ffafa705 100644 --- a/src/entities/Entity.h +++ b/src/entities/Entity.h @@ -71,10 +71,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 @@ -156,7 +154,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; } |