Merge pull request #342 from Nick007J/master

fixed dummyobject bug
GTAmodding · Mar 4, 2020 · 19488323eab42faffe6e24f91592fffa8e2a39e8 · 1948832
2 parents de68d72 + 8c13eab
commit 19488323eab42faffe6e24f91592fffa8e2a39e8
Unified Split

Showing with 2 additions and 2 deletions.

+2 −2 src/peds/Population.cpp
diff --git 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);