diff options
author | megamage <none@none> | 2009-02-04 17:22:43 -0600 |
---|---|---|
committer | megamage <none@none> | 2009-02-04 17:22:43 -0600 |
commit | d69198732e65002b53bab3a85779107490fe4dd2 (patch) | |
tree | e1f4b11f1964cc42ac05c79bdc43eedc1db16866 /src/game/MotionMaster.cpp | |
parent | 5d4d9530556eb66940775f12c3cc5f3c115447ca (diff) | |
parent | c745eba4a1d122b4184b27a982674c86ff193c23 (diff) |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/MotionMaster.cpp')
-rw-r--r-- | src/game/MotionMaster.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp index d93f2e0681d..96072014fa8 100644 --- a/src/game/MotionMaster.cpp +++ b/src/game/MotionMaster.cpp @@ -366,7 +366,7 @@ void MotionMaster::Mutate(MovementGenerator *m, MovementSlot slot) } else if(i_top < slot) { - i_top = slot; + i_top = slot; } m->Initialize(*i_owner); Impl[slot] = m; @@ -400,13 +400,13 @@ void MotionMaster::MovePath(uint32 path_id, bool repeatable) if( !isStatic( curr ) ) delete curr; }*/ - + //i_owner->GetTypeId()==TYPEID_PLAYER ? //Mutate(new WaypointMovementGenerator<Player>(path_id, repeatable)): Mutate(new WaypointMovementGenerator<Creature>(path_id, repeatable), MOTION_SLOT_IDLE); - - DEBUG_LOG("%s (GUID: %u) start moving over path(Id:%u, repeatable: %s)", - i_owner->GetTypeId()==TYPEID_PLAYER ? "Player" : "Creature", + + DEBUG_LOG("%s (GUID: %u) start moving over path(Id:%u, repeatable: %s)", + i_owner->GetTypeId()==TYPEID_PLAYER ? "Player" : "Creature", i_owner->GetGUIDLow(), path_id, repeatable ? "YES" : "NO" ); } |