Merge remote-tracking branch 'samler/world' into Standalone

This commit is contained in:
Sergeanur 2020-04-17 15:06:49 +03:00
commit c8af08330a

View File

@ -753,6 +753,7 @@ CWorld::FindObjectsOfTypeInRangeSectorList(uint32 modelId, CPtrList &list, const
CEntity *pEntity = (CEntity *)pNode->item; CEntity *pEntity = (CEntity *)pNode->item;
if(pEntity->m_scanCode != GetCurrentScanCode()) { if(pEntity->m_scanCode != GetCurrentScanCode()) {
pEntity->m_scanCode = GetCurrentScanCode(); pEntity->m_scanCode = GetCurrentScanCode();
if(modelId == pEntity->m_modelIndex) {
float fMagnitude = 0.0f; float fMagnitude = 0.0f;
if(bCheck2DOnly) if(bCheck2DOnly)
fMagnitude = (position - pEntity->GetPosition()).MagnitudeSqr2D(); fMagnitude = (position - pEntity->GetPosition()).MagnitudeSqr2D();
@ -764,6 +765,7 @@ CWorld::FindObjectsOfTypeInRangeSectorList(uint32 modelId, CPtrList &list, const
} }
} }
} }
}
} }
void void