*Merge.

--HG--
branch : trunk

src/game/Object.cpp

@@ -1648,3 +1648,15 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y,
 
 	UpdateGroundPositionZ(x,y,z);
 }
+
+void WorldObject::GetClosePointAt(float &x, float &y, float &z, float dist, float angle)
+{
+    angle += GetOrientation();
+    x += dist * cos(angle);
+    y += dist * sin(angle);
+    Trinity::NormalizeMapCoord(x);
+    Trinity::NormalizeMapCoord(y);
+    UpdateGroundPositionZ(x, y, z);
+}
+
+