josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Fix non-PCH build

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Spp
2010-12-17 08:54:15 +01:00
parent 0c6750dd52
commit a47150abb3
2 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/DungeonFinding/LFG.h
+28 -4
View File
@@ -47,10 +47,6 @@ enum LfgUpdateType
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
src/server/game/DungeonFinding/LFGMgr.h
-24
View File
@@ -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
{