a3x
/
re3
mirror of https://git.rip/DMCA_FUCKER/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into script_dev

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)
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);