Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
This commit is contained in:
Vincent_Michael committed 2013-02-03 23:11:48 +01:00
commit 66dfcd2b43
20 files changed
+409 -331

No files matched your search

@@ -108,6 +108,14 @@ void ScriptedAI::AttackStartNoMove(Unit* who)
DoStartNoMovement(who);
}
void ScriptedAI::AttackStart(Unit* who)
{
if (IsCombatMovementAllowed())
CreatureAI::AttackStart(who);
else
AttackStartNoMove(who);
}
void ScriptedAI::UpdateAI(uint32 const /*diff*/)
{
//Check if we have a current target