Changeset 18 for trunk/src/game/RandomMovementGenerator.cpp

Timestamp:

11/19/08 13:23:29 (17 years ago)

Author:

yumileroy

Message:

[svn] * Little fix in RandomMovementGenerator?
* Updated to 6731 and 680

Original author: Neo2003
Date: 2008-10-06 04:48:59-05:00

Files:

• trunk/src/game/RandomMovementGenerator.cpp (modified) (5 diffs)

trunk/src/game/RandomMovementGenerator.cpp

@@ -32 +32 @@
     float X,Y,Z,z,nx,ny,nz,wander_distance,ori,dist;
 
-    creature.GetRespawnCoord(X, Y, Z);
     creature.GetRespawnCoord(X, Y, Z, &ori, &wander_distance);
 
@@ -51 +50 @@
     nx = X + distanceX;
     ny = Y + distanceY;
+
+    // prevent invalid coordinates generation 
+    MaNGOS::NormalizeMapCoord(nx);
+    MaNGOS::NormalizeMapCoord(ny);
+
     dist = distanceX*distanceX + distanceY*distanceY;
 
@@ -88 +92 @@
     {
         i_nextMoveTime.Reset(i_destinationHolder.GetTotalTravelTime());
-        creature.SetUnitMovementFlags(MOVEMENTFLAG_FLYING2);
+        creature.AddUnitMovementFlag(MOVEMENTFLAG_FLYING2);
     }
     //else if (is_water_ok) // Swimming mode to be done with more than this check
@@ -106 +110 @@
 
     if (creature.canFly())
-        creature.SetUnitMovementFlags(MOVEMENTFLAG_FLYING2);
+        creature.AddUnitMovementFlag(MOVEMENTFLAG_FLYING2);
     else
         creature.SetUnitMovementFlags(irand(0,RUNNING_CHANCE_RANDOMMV) > 0 ? MOVEMENTFLAG_WALK_MODE : MOVEMENTFLAG_NONE );
@@ -145 +149 @@
         {
             if (creature.canFly())
-                creature.SetUnitMovementFlags(MOVEMENTFLAG_FLYING2);
+                creature.AddUnitMovementFlag(MOVEMENTFLAG_FLYING2);
             else
                 creature.SetUnitMovementFlags(irand(0,RUNNING_CHANCE_RANDOMMV) > 0 ? MOVEMENTFLAG_WALK_MODE : MOVEMENTFLAG_NONE);