diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-04 23:14:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 23:14:17 +0300 |
| commit | 19488323eab42faffe6e24f91592fffa8e2a39e8 (patch) | |
| tree | c4729ff12f1e31d64983f4dcddb654c3b1c80f9e | |
| parent | de68d726a3dc005d9dd395a42d393bc1f43104d4 (diff) | |
| parent | 8c13eab30a8f84ed49418c46f2120528471c6fd7 (diff) | |
Merge pull request #342 from Nick007J/master
fixed dummyobject bug
| -rw-r--r-- | src/peds/Population.cpp | 4 |
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); |