mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-11-01 00:15:55 +00:00
Merge branch 'master' into script_dev
This commit is contained in:
commit
24ad650eb3
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue