immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #817 from CyborgMaster/radarall-equidistant-objects 

radarall can return multiple objects with exactly the same distance
dev-new-models
krzys_h 2016-09-09 19:17:40 +02:00 committed by GitHub
parent e3b3d7c9aa 859cec774a
commit 8dc03f40d5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/object/object_manager.cpp
View File

@ -282,7 +282,10 @@ std::vector<CObject*> CObjectManager::RadarAll(CObject* pThis, Math::Vector this
RadarFilter filter_flying = static_cast<RadarFilter>(filter & (FILTER_ONLYLANDING | FILTER_ONLYFLYING));
RadarFilter filter_enemy = static_cast<RadarFilter>(filter & (FILTER_FRIENDLY | FILTER_ENEMY | FILTER_NEUTRAL));
std::map<float, CObject*> best;
// Use a multimap to allow for multiple objects at exactly the same distance
// from the origin to be returned.
std::multimap<float, CObject*> best;
for ( auto it = m_objects.begin() ; it != m_objects.end() ; ++it )
{
pObj = it->second.get();
@ -357,7 +360,7 @@ std::vector<CObject*> CObjectManager::RadarAll(CObject* pThis, Math::Vector this
a = Math::RotateAngle(oPos.x-iPos.x, iPos.z-oPos.z); // CW !
if ( Math::TestAngle(a, iAngle-focus/2.0f, iAngle+focus/2.0f) || focus >= Math::PI*2.0f )
{
best[d] = pObj;
best.insert(std::make_pair(d, pObj));
}
}