mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-15 18:39:00 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Sergeanur 2020-04-17 15:06:49 +03:00
commit c8af08330a
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/World.cpp
View file

@ -753,14 +753,16 @@ 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();
float fMagnitude = 0.0f; if(modelId == pEntity->m_modelIndex) {
if(bCheck2DOnly) float fMagnitude = 0.0f;
fMagnitude = (position - pEntity->GetPosition()).MagnitudeSqr2D(); if(bCheck2DOnly)
else fMagnitude = (position - pEntity->GetPosition()).MagnitudeSqr2D();
fMagnitude = (position - pEntity->GetPosition()).MagnitudeSqr(); else
if(fMagnitude < radius * radius && *nEntitiesFound < maxEntitiesToFind) { fMagnitude = (position - pEntity->GetPosition()).MagnitudeSqr();
if(aEntities) aEntities[*nEntitiesFound] = pEntity; if(fMagnitude < radius * radius && *nEntitiesFound < maxEntitiesToFind) {
++*nEntitiesFound; if(aEntities) aEntities[*nEntitiesFound] = pEntity;
++*nEntitiesFound;
}
} }
} }
} }