mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-08-11 17:24:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #342 from Nick007J/master

Browse Source 
fixed dummyobject bug
This commit is contained in:
Nikolay Korolev
2020-03-04 23:14:17 +03:00
committed by GitHub
parent de68d726a3 8c13eab30a
commit 19488323ea
1 changed files with 2 additions and 2 deletions
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);