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

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
This commit is contained in:
Vincent-Michael committed 2014-04-22 20:06:40 +02:00
commit 5bb19ce017
27 files changed
+164291 -120

No files matched your search

@@ -1313,6 +1313,12 @@ enum SmartCastFlags
SMARTCAST_COMBAT_MOVE = 0x40 //Prevents combat movement if cast successful. Allows movement on range, OOM, LOS
};
enum BroadcastTextIds
{
BROADCAST_TEXT_CALL_FOR_HELP = 2541,
BROADCAST_TEXT_FLEE_FOR_ASSIST = 1150
};
// one line in DB is one event
struct SmartScriptHolder
{