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

Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
Vincent-Michael committed 2013-08-11 18:37:31 +02:00
commit f506ee3077
15 files changed
+228 -79

No files matched your search

@@ -398,7 +398,7 @@ enum SMART_ACTION
SMART_ACTION_THREAT_SINGLE_PCT = 13, // Threat%
SMART_ACTION_THREAT_ALL_PCT = 14, // Threat%
SMART_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS = 15, // QuestID
SMART_ACTION_SEND_CASTCREATUREORGO = 16, // QuestID, SpellId
SMART_ACTION_UNUSED_16 = 16, // UNUSED
SMART_ACTION_SET_EMOTE_STATE = 17, // emoteID
SMART_ACTION_SET_UNIT_FLAG = 18, // Flags (may be more than one field OR'd together), Target
SMART_ACTION_REMOVE_UNIT_FLAG = 19, // Flags (may be more than one field OR'd together), Target
@@ -576,12 +576,6 @@ struct SmartAction
uint32 threatDEC;
} threatPCT;
struct
{
uint32 quest;
uint32 spell;
} castCreatureOrGO;
struct
{
uint32 flag1;
@@ -627,7 +621,7 @@ struct SmartAction
{
uint32 creature;
uint32 spell;
} castedCreatureOrGO;
} callCastedCreatureOrGO;
struct
{