*Merge.

--HG-- branch : trunk
2009-01-09 16:43:23 -06:00
parent 5c8f52d134 90a82a81ad
commit 1ffb1cef33
66 changed files with 1270 additions and 621 deletions
@@ -394,6 +394,12 @@ class TRINITY_DLL_SPEC WorldObject : public Object
            // angle calculated from current orientation
            GetNearPoint(NULL,x,y,z,size,distance2d,GetOrientation() + angle);
        }
+        void GetClosePointAt(float &x, float &y, float &z, float dist, float angle);
+        void GetClosePoint(float &x, float &y, float &z, float dist, float angle)
+        {
+            GetPosition(x, y, z);
+            GetClosePointAt(x, y, z, dist, angle);
+        }
        void GetContactPoint( const WorldObject* obj, float &x, float &y, float &z, float distance2d = CONTACT_DISTANCE) const
        {
            // angle to face `obj` to `this` using distance includes size of `obj`