*Merge.

--HG--
branch : trunk

src/game/Object.cpp

@@ -1702,7 +1702,7 @@ void WorldObject::GetNearPoint2D(float &x, float &y, float distance2d, float abs
 void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float searcher_size, float distance2d, float absAngle ) const
 {
     GetNearPoint2D(x,y,distance2d+searcher_size,absAngle);
-    
+
 	z = GetPositionZ();
 
 	UpdateGroundPositionZ(x,y,z);