summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-01-31 01:19:25 +0100
committerwithmorten <morten.with@gmail.com>2021-01-31 01:19:25 +0100
commit2e37001881eab8932dafcfd345fd9bb641bb70f4 (patch)
treeeb00d6f01ec00c3aec6cd5f05c8332d9398a3094
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
downloadre3-2e37001881eab8932dafcfd345fd9bb641bb70f4.tar
re3-2e37001881eab8932dafcfd345fd9bb641bb70f4.tar.gz
re3-2e37001881eab8932dafcfd345fd9bb641bb70f4.tar.bz2
re3-2e37001881eab8932dafcfd345fd9bb641bb70f4.tar.lz
re3-2e37001881eab8932dafcfd345fd9bb641bb70f4.tar.xz
re3-2e37001881eab8932dafcfd345fd9bb641bb70f4.tar.zst
re3-2e37001881eab8932dafcfd345fd9bb641bb70f4.zip
-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 8c4714fb..dfbc02d7 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -1394,6 +1394,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 bdde5e33..3a303194 100644
--- a/src/rw/VisibilityPlugins.cpp
+++ b/src/rw/VisibilityPlugins.cpp
@@ -96,6 +96,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;