*Merge SD2.

*r968: Adjust some scripts to use SetEquipmentSlots()
*r969: Made a few corrections to EventAI.txt
*r970: Added ScriptedAI function SetCombatMovement() for future use/development.
*r971: Small adjustments to escortAI, remove some useless code and always use current WaitTimer if not already 0 after return to last known waypoint.
*r972: Added support for quest 1651

--HG--
branch : trunk

src/bindings/scripts/include/sc_creature.h

@@ -188,6 +188,11 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
     void SetEquipmentSlots(bool bLoadDefault, int32 uiMainHand = EQUIP_NO_CHANGE, int32 uiOffHand = EQUIP_NO_CHANGE, int32 uiRanged = EQUIP_NO_CHANGE);
 
     void SetSheathState(SheathState newState);
+    
+    void SetCombatMovement(bool CombatMove);
+    
+    protected:
+        bool CombatMovement;
 };
 
 struct TRINITY_DLL_DECL Scripted_NoMovementAI : public ScriptedAI