summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-01-31 02:08:42 +0100
committerwithmorten <morten.with@gmail.com>2021-01-31 02:08:42 +0100
commitda378077f78a1773a6c4bf5a768c6ebb5a7c75b5 (patch)
tree348c13d4b3cac0d04d97c1830b6e10f4dd19bafa /src
parentMerge branch 'master' of https://github.com/GTAmodding/re3 (diff)
downloadre3-da378077f78a1773a6c4bf5a768c6ebb5a7c75b5.tar
re3-da378077f78a1773a6c4bf5a768c6ebb5a7c75b5.tar.gz
re3-da378077f78a1773a6c4bf5a768c6ebb5a7c75b5.tar.bz2
re3-da378077f78a1773a6c4bf5a768c6ebb5a7c75b5.tar.lz
re3-da378077f78a1773a6c4bf5a768c6ebb5a7c75b5.tar.xz
re3-da378077f78a1773a6c4bf5a768c6ebb5a7c75b5.tar.zst
re3-da378077f78a1773a6c4bf5a768c6ebb5a7c75b5.zip
Diffstat (limited to 'src')
-rw-r--r--src/render/Renderer.cpp4
-rw-r--r--src/rw/VisibilityPlugins.cpp4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index d41f27e3..2c224677 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -1396,6 +1396,10 @@ CRenderer::ScanSectorPoly(RwV2d *poly, int32 numVertices, void (*scanfunc)(CPtrL
void
CRenderer::InsertEntityIntoList(CEntity *ent)
{
+#ifdef FIX_BUGS
+ if (!ent->m_rwObject) return;
+#endif
+
#ifdef NEW_RENDERER
// TODO: there are more flags being checked here
if(gbNewRenderer && (ent->IsVehicle() || ent->IsPed()))
diff --git a/src/rw/VisibilityPlugins.cpp b/src/rw/VisibilityPlugins.cpp
index 32461d1c..051a6883 100644
--- a/src/rw/VisibilityPlugins.cpp
+++ b/src/rw/VisibilityPlugins.cpp
@@ -192,6 +192,10 @@ CVisibilityPlugins::InitAlphaEntityList(void)
bool
CVisibilityPlugins::InsertEntityIntoSortedList(CEntity *e, float dist)
{
+#ifdef FIX_BUGS
+ if (!e->m_rwObject) return true;
+#endif
+
AlphaObjectInfo item;
item.entity = e;
item.sort = dist;