summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-03-04 21:14:17 +0100
committerGitHub <noreply@github.com>2020-03-04 21:14:17 +0100
commit19488323eab42faffe6e24f91592fffa8e2a39e8 (patch)
treec4729ff12f1e31d64983f4dcddb654c3b1c80f9e /src
parentMerge pull request #340 from erorcun/erorcun (diff)
parentfixed dummyobject bug (diff)
downloadre3-19488323eab42faffe6e24f91592fffa8e2a39e8.tar
re3-19488323eab42faffe6e24f91592fffa8e2a39e8.tar.gz
re3-19488323eab42faffe6e24f91592fffa8e2a39e8.tar.bz2
re3-19488323eab42faffe6e24f91592fffa8e2a39e8.tar.lz
re3-19488323eab42faffe6e24f91592fffa8e2a39e8.tar.xz
re3-19488323eab42faffe6e24f91592fffa8e2a39e8.tar.zst
re3-19488323eab42faffe6e24f91592fffa8e2a39e8.zip
Diffstat (limited to 'src')
-rw-r--r--src/peds/Population.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp
index 6b15d8c7..bcbe7794 100644
--- a/src/peds/Population.cpp
+++ b/src/peds/Population.cpp
@@ -973,7 +973,7 @@ CPopulation::ConvertToDummyObject(CObject *obj)
if (!dummy)
return;
- dummy->GetMatrix() = obj->GetMatrix();
+ dummy->GetMatrix() = obj->m_objectMatrix;
dummy->GetMatrix().UpdateRW();
dummy->UpdateRwFrame();
@@ -998,7 +998,7 @@ bool
CPopulation::TestRoomForDummyObject(CObject *obj)
{
int16 collidingObjs;
- CWorld::FindObjectsKindaColliding(obj->GetPosition(),
+ CWorld::FindObjectsKindaColliding(obj->m_objectMatrix.GetPosition(),
CModelInfo::GetModelInfo(obj->m_modelIndex)->GetColModel()->boundingSphere.radius,
false, &collidingObjs, 2, nil, false, true, true, false, false);