Changeset 119

Timestamp:

11/19/08 13:37:56 (17 years ago)

Author:

yumileroy

Message:

[svn] Fix some mistakes of the last two commits.

Original author: megamage
Date: 2008-10-27 08:28:57-05:00

Location:

trunk/src

Files:

• bindings/scripts/sql/Updates/r125_trinity.sql (modified) (1 diff)
• game/Object.cpp (modified) (1 diff)
• game/Object.h (modified) (1 diff)

trunk/src/bindings/scripts/sql/Updates/r125_trinity.sql

@@ -1 @@
-update creature_template set speed='0.01' scriptname='mob_toxic_sporebat' WHERE entry=22140;
+update creature_template set speed='0.01',scriptname='mob_toxic_sporebat' WHERE entry=22140;
 update creature_template SET scriptname='npc_overlord_morghor' WHERE entry=23139;
 update creature_template SET scriptname='npc_lord_illidan_stormrage' WHERE entry=22083;

trunk/src/game/Object.cpp

@@ -1489 +1489 @@
     GetNearPoint2D(x,y,distance2d+searcher_size,absAngle);
     
-    z = GetPositionZ();
-    
-    UpdateGroundPositionZ(x,y,z);
-}
+        z = GetPositionZ();
+
+        UpdateGroundPositionZ(x,y,z);
+}
+
+void WorldObject::GetRandomContactPoint( const WorldObject* obj, float &x, float &y, float &z, float distance2dMin, float distance2dMax ) const
+{
+        float object_size = obj->GetObjectSize();//here we use object_size to determine the angle offset, the bigger object the smaller angle offset, then this makes mob move naturally in visual.
+        //let assume 12.0f is the max size for object to have 0 angle offset.
+        float angle_offset_ratio = 1 - object_size/12.0f;
+        if (angle_offset_ratio < 0.05) angle_offset_ratio = 0.05;
+        // angle to face `obj` to `this`plus a random angle offset(from -90 degree to 90 degree)*angle_offset_ratio using distance from distance2dMin to distance2dMax includes size of `obj`
+        GetNearPoint(obj,x,y,z,object_size,distance2dMin+(distance2dMax-distance2dMin)*rand_norm(), GetAngle( obj ) + (M_PI_2 - M_PI * rand_norm()) * angle_offset_ratio);
+}

trunk/src/game/Object.h

@@ -373 +373 @@
             GetNearPoint(obj,x,y,z,obj->GetObjectSize(),distance2d,GetAngle( obj ));
         }
-        void GetRandomContactPoint( const WorldObject* obj, float &x, float &y, float &z, float distance2dMin, float distance2dMax ) const
-        {
-            float object_size = obj->GetObjectSize();//here we use object_size to determine the angle offset, the bigger object the smaller angle offset, then this makes mob move naturally in visual.
-            //let assume 12.0f is the max size for object to have 0 angle offset.
-            float angle_offset_ratio = 1 - object_size/12.0f;
-            if (angle_offset_ratio < 0.05) angle_offset_ratio = 0.05;
-            // angle to face `obj` to `this`plus a random angle offset(from -90 degree to 90 degree)*angle_offset_ratio using distance from distance2dMin to distance2dMax includes size of `obj`
-            GetNearPoint(obj,x,y,z,object_size,distance2dMin+(distance2dMax-distance2dMin)*rand_norm(), GetAngle( obj ) + (M_PI_2 - M_PI * rand_norm()) * angle_offset_ratio);
-        }
+        void GetRandomContactPoint( const WorldObject* obj, float &x, float &y, float &z, float distance2dMin, float distance2dMax ) const;
 
         float GetObjectSize() const