diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2015-06-26 03:57:57 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-06-26 03:57:57 +0100 |
| commit | 2ce76a25c32453f3be1297a10198c43b231174ed (patch) | |
| tree | 23c8b049684974734b514f80554f386f4c4ba6ae | |
| parent | 9292217ccc14e635180101bdf8e1191c94aaae91 (diff) | |
Fix build after recent cherry picks
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/DungeonFinding/LFGMgr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 22decfaf883..c8ccc15019d 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -1565,7 +1565,7 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) if (!effect) continue; - if (effect->ChainTarget > 0) + if (effect->ChainTargets > 0) continue; switch (effect->TargetA.GetSelectionCategory()) diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index 5fd0decadaf..34996410fbe 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -98,7 +98,7 @@ enum LfgJoinResult LFG_JOIN_GROUPFULL = 0x1C, // Your group is full LFG_JOIN_INTERNAL_ERROR = 0x1E, // Internal LFG Error LFG_JOIN_NOT_MEET_REQS = 0x1F, // You do not meet the requirements for the chosen dungeons - //LFG_JOIN_PARTY_NOT_MEET_REQS = 6, // One or more party members do not meet the requirements for the chosen dungeons + LFG_JOIN_PARTY_NOT_MEET_REQS = 6, // One or more party members do not meet the requirements for the chosen dungeons (FIXME) LFG_JOIN_MIXED_RAID_DUNGEON = 0x20, // You cannot mix dungeons, raids, and random when picking dungeons LFG_JOIN_MULTI_REALM = 0x21, // The dungeon you chose does not support players from multiple realms LFG_JOIN_DISCONNECTED = 0x22, // One or more party members are pending invites or disconnected |