aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSpp <none@none>2010-12-17 08:54:15 +0100
committerSpp <none@none>2010-12-17 08:54:15 +0100
commita47150abb3bd44ca31e4f6a7192c478b05c86263 (patch)
treed859df2d7ec540bd0644811a32bd288e28b27046 /src
parent0c6750dd52ff2d53b6937cb5d280981b17ee38ed (diff)
Core: Fix non-PCH build
--HG-- branch : trunk
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/DungeonFinding/LFG.h70
-rwxr-xr-xsrc/server/game/DungeonFinding/LFGMgr.h24
2 files changed, 47 insertions, 47 deletions
diff --git a/src/server/game/DungeonFinding/LFG.h b/src/server/game/DungeonFinding/LFG.h
index 31c40b2bcfe..236831ed1f9 100755
--- a/src/server/game/DungeonFinding/LFG.h
+++ b/src/server/game/DungeonFinding/LFG.h
@@ -22,35 +22,31 @@
enum LfgRoles
{
- ROLE_NONE = 0x00,
- ROLE_LEADER = 0x01,
- ROLE_TANK = 0x02,
- ROLE_HEALER = 0x04,
- ROLE_DAMAGE = 0x08,
+ ROLE_NONE = 0x00,
+ ROLE_LEADER = 0x01,
+ ROLE_TANK = 0x02,
+ ROLE_HEALER = 0x04,
+ ROLE_DAMAGE = 0x08,
};
enum LfgUpdateType
{
- LFG_UPDATETYPE_DEFAULT = 0, // Internal Use
- LFG_UPDATETYPE_LEADER = 1,
- LFG_UPDATETYPE_ROLECHECK_ABORTED = 4,
- LFG_UPDATETYPE_JOIN_PROPOSAL = 5,
- LFG_UPDATETYPE_ROLECHECK_FAILED = 6,
- LFG_UPDATETYPE_REMOVED_FROM_QUEUE = 7,
- LFG_UPDATETYPE_PROPOSAL_FAILED = 8,
- LFG_UPDATETYPE_PROPOSAL_DECLINED = 9,
- LFG_UPDATETYPE_GROUP_FOUND = 10,
- LFG_UPDATETYPE_ADDED_TO_QUEUE = 12,
- LFG_UPDATETYPE_PROPOSAL_BEGIN = 13,
- LFG_UPDATETYPE_CLEAR_LOCK_LIST = 14,
- LFG_UPDATETYPE_GROUP_MEMBER_OFFLINE = 15,
- LFG_UPDATETYPE_GROUP_DISBAND = 16,
+ LFG_UPDATETYPE_DEFAULT = 0, // Internal Use
+ LFG_UPDATETYPE_LEADER = 1,
+ LFG_UPDATETYPE_ROLECHECK_ABORTED = 4,
+ LFG_UPDATETYPE_JOIN_PROPOSAL = 5,
+ LFG_UPDATETYPE_ROLECHECK_FAILED = 6,
+ LFG_UPDATETYPE_REMOVED_FROM_QUEUE = 7,
+ LFG_UPDATETYPE_PROPOSAL_FAILED = 8,
+ LFG_UPDATETYPE_PROPOSAL_DECLINED = 9,
+ LFG_UPDATETYPE_GROUP_FOUND = 10,
+ LFG_UPDATETYPE_ADDED_TO_QUEUE = 12,
+ LFG_UPDATETYPE_PROPOSAL_BEGIN = 13,
+ LFG_UPDATETYPE_CLEAR_LOCK_LIST = 14,
+ LFG_UPDATETYPE_GROUP_MEMBER_OFFLINE = 15,
+ LFG_UPDATETYPE_GROUP_DISBAND = 16,
};
-typedef std::set<uint32> LfgDungeonSet;
-typedef std::set<LfgLockStatus*> LfgLockStatusSet;
-typedef std::map<uint64, LfgLockStatusSet*> LfgLockStatusMap;
-
enum LfgState
{
LFG_STATE_NONE, // Not using LFG / LFR
@@ -63,4 +59,32 @@ enum LfgState
LFG_STATE_RAIDBROWSER, // Using Raid finder
};
+/// Instance lock types
+enum LfgLockStatusType
+{
+ LFG_LOCKSTATUS_OK = 0, // Internal use only
+ LFG_LOCKSTATUS_INSUFFICIENT_EXPANSION = 1,
+ LFG_LOCKSTATUS_TOO_LOW_LEVEL = 2,
+ LFG_LOCKSTATUS_TOO_HIGH_LEVEL = 3,
+ LFG_LOCKSTATUS_TOO_LOW_GEAR_SCORE = 4,
+ LFG_LOCKSTATUS_TOO_HIGH_GEAR_SCORE = 5,
+ LFG_LOCKSTATUS_RAID_LOCKED = 6,
+ LFG_LOCKSTATUS_ATTUNEMENT_TOO_LOW_LEVEL = 1001,
+ LFG_LOCKSTATUS_ATTUNEMENT_TOO_HIGH_LEVEL = 1002,
+ LFG_LOCKSTATUS_QUEST_NOT_COMPLETED = 1022,
+ LFG_LOCKSTATUS_MISSING_ITEM = 1025,
+ LFG_LOCKSTATUS_NOT_IN_SEASON = 1031,
+};
+
+/// Dungeon and reason why player can't join
+struct LfgLockStatus
+{
+ uint32 dungeon; ///< Dungeon Id
+ LfgLockStatusType lockstatus; ///< Lock type
+};
+
+typedef std::set<uint32> LfgDungeonSet;
+typedef std::set<LfgLockStatus*> LfgLockStatusSet;
+typedef std::map<uint64, LfgLockStatusSet*> LfgLockStatusMap;
+
#endif
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
index 4a391914b5f..4cf17f2fc58 100755
--- a/src/server/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
@@ -61,23 +61,6 @@ enum LfgProposalState
LFG_PROPOSAL_SUCCESS = 2,
};
-/// Instance lock types
-enum LfgLockStatusType
-{
- LFG_LOCKSTATUS_OK = 0, // Internal use only
- LFG_LOCKSTATUS_INSUFFICIENT_EXPANSION = 1,
- LFG_LOCKSTATUS_TOO_LOW_LEVEL = 2,
- LFG_LOCKSTATUS_TOO_HIGH_LEVEL = 3,
- LFG_LOCKSTATUS_TOO_LOW_GEAR_SCORE = 4,
- LFG_LOCKSTATUS_TOO_HIGH_GEAR_SCORE = 5,
- LFG_LOCKSTATUS_RAID_LOCKED = 6,
- LFG_LOCKSTATUS_ATTUNEMENT_TOO_LOW_LEVEL = 1001,
- LFG_LOCKSTATUS_ATTUNEMENT_TOO_HIGH_LEVEL = 1002,
- LFG_LOCKSTATUS_QUEST_NOT_COMPLETED = 1022,
- LFG_LOCKSTATUS_MISSING_ITEM = 1025,
- LFG_LOCKSTATUS_NOT_IN_SEASON = 1031,
-};
-
/// Teleport errors
enum LfgTeleportError
{
@@ -161,13 +144,6 @@ typedef std::map<uint32, LfgPlayerBoot*> LfgPlayerBootMap;
typedef std::map<uint64, LfgGroupData> LfgGroupDataMap;
typedef std::map<uint64, LfgPlayerData> LfgPlayerDataMap;
-/// Dungeon and reason why player can't join
-struct LfgLockStatus
-{
- uint32 dungeon; ///< Dungeon Id
- LfgLockStatusType lockstatus; ///< Lock type
-};
-
// Data needed by SMSG_LFG_JOIN_RESULT
struct LfgJoinResultData
{