summaryrefslogtreecommitdiffstats
path: root/src/objects
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-12-09 09:55:50 +0100
committerGitHub <noreply@github.com>2020-12-09 09:55:50 +0100
commitccbbde549e81a7d0e71228ad5c244da6c8bd287f (patch)
treeb05d46740914289c3e713579716ef7cfa0068244 /src/objects
parentVehicle cam object collision fix (diff)
parentsync with upstream (diff)
downloadre3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar
re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.gz
re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.bz2
re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.lz
re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.xz
re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.zst
re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.zip
Diffstat (limited to 'src/objects')
-rw-r--r--src/objects/Object.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index 16483cca..0605f54f 100644
--- a/src/objects/Object.cpp
+++ b/src/objects/Object.cpp
@@ -825,7 +825,7 @@ IsObjectPointerValid(CObject *pObject)
{
if (!pObject)
return false;
- int index = CPools::GetObjectPool()->GetJustIndex(pObject);
+ int index = CPools::GetObjectPool()->GetJustIndex_NoFreeAssert(pObject);
#ifdef FIX_BUGS
if (index < 0 || index >= CPools::GetObjectPool()->GetSize())
#else