1
0

Merge branch 'master' into warnings

This commit is contained in:
Tycho
2014-03-14 06:46:20 -07:00
2 changed files with 7 additions and 4 deletions

View File

@@ -2453,14 +2453,14 @@ cPlayer * cWorld::FindClosestPlayer(const Vector3d & a_Pos, float a_SightLimit,
{
cTracer LineOfSight(this);
float ClosestDistance = a_SightLimit;
cPlayer* ClosestPlayer = NULL;
double ClosestDistance = a_SightLimit;
cPlayer * ClosestPlayer = NULL;
cCSLock Lock(m_CSPlayers);
for (cPlayerList::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
{
Vector3f Pos = (*itr)->GetPosition();
float Distance = (Pos - a_Pos).Length();
double Distance = (Pos - a_Pos).Length();
if (Distance < ClosestDistance)
{