a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-01 03:35:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into script_dev

Browse source
This commit is contained in:
Nikolay Korolev 2020-03-04 23:14:54 +03:00
parent 2058ca6bbb 19488323ea
commit 24ad650eb3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/peds/Population.cpp
View file

@ -973,7 +973,7 @@ CPopulation::ConvertToDummyObject(CObject *obj)
if (!dummy) if (!dummy)
return; return;
dummy->GetMatrix() = obj->GetMatrix(); dummy->GetMatrix() = obj->m_objectMatrix;
dummy->GetMatrix().UpdateRW(); dummy->GetMatrix().UpdateRW();
dummy->UpdateRwFrame(); dummy->UpdateRwFrame();
@ -998,7 +998,7 @@ bool
CPopulation::TestRoomForDummyObject(CObject *obj) CPopulation::TestRoomForDummyObject(CObject *obj)
{ {
int16 collidingObjs; int16 collidingObjs;
CWorld::FindObjectsKindaColliding(obj->GetPosition(), CWorld::FindObjectsKindaColliding(obj->m_objectMatrix.GetPosition(),
CModelInfo::GetModelInfo(obj->m_modelIndex)->GetColModel()->boundingSphere.radius, CModelInfo::GetModelInfo(obj->m_modelIndex)->GetColModel()->boundingSphere.radius,
false, &collidingObjs, 2, nil, false, true, true, false, false); false, &collidingObjs, 2, nil, false, true, true, false, false);