From 0c44943cd2e7b7ae550cc927420ab1a86a3b9a1f Mon Sep 17 00:00:00 2001 From: Spp Date: Tue, 21 Dec 2010 22:33:17 +0100 Subject: Core/Dungeon Finder: Multiple changes - Simplify lock status calculations by caching player locked dungeons - Fix incorrect Lfg State loading for groups - All reference variables that are supposed not to be modified are declared as const - Use full group guids in rolechecks - Add some debug msgs - Fix some warnings --HG-- branch : trunk --- src/server/game/DungeonFinding/LFG.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server/game/DungeonFinding/LFG.h') diff --git a/src/server/game/DungeonFinding/LFG.h b/src/server/game/DungeonFinding/LFG.h index 236831ed1f9..4ccec91c7d6 100755 --- a/src/server/game/DungeonFinding/LFG.h +++ b/src/server/game/DungeonFinding/LFG.h @@ -26,7 +26,7 @@ enum LfgRoles ROLE_LEADER = 0x01, ROLE_TANK = 0x02, ROLE_HEALER = 0x04, - ROLE_DAMAGE = 0x08, + ROLE_DAMAGE = 0x08 }; enum LfgUpdateType @@ -44,7 +44,7 @@ enum LfgUpdateType LFG_UPDATETYPE_PROPOSAL_BEGIN = 13, LFG_UPDATETYPE_CLEAR_LOCK_LIST = 14, LFG_UPDATETYPE_GROUP_MEMBER_OFFLINE = 15, - LFG_UPDATETYPE_GROUP_DISBAND = 16, + LFG_UPDATETYPE_GROUP_DISBAND = 16 }; enum LfgState @@ -56,7 +56,7 @@ enum LfgState LFG_STATE_BOOT, // Vote kick active LFG_STATE_DUNGEON, // In LFG Group, in a Dungeon LFG_STATE_FINISHED_DUNGEON, // In LFG Group, in a finished Dungeon - LFG_STATE_RAIDBROWSER, // Using Raid finder + LFG_STATE_RAIDBROWSER // Using Raid finder }; /// Instance lock types @@ -73,7 +73,7 @@ enum LfgLockStatusType LFG_LOCKSTATUS_ATTUNEMENT_TOO_HIGH_LEVEL = 1002, LFG_LOCKSTATUS_QUEST_NOT_COMPLETED = 1022, LFG_LOCKSTATUS_MISSING_ITEM = 1025, - LFG_LOCKSTATUS_NOT_IN_SEASON = 1031, + LFG_LOCKSTATUS_NOT_IN_SEASON = 1031 }; /// Dungeon and reason why player can't join @@ -84,7 +84,7 @@ struct LfgLockStatus }; typedef std::set LfgDungeonSet; -typedef std::set LfgLockStatusSet; -typedef std::map LfgLockStatusMap; +typedef std::map LfgLockMap; +typedef std::map LfgLockPartyMap; #endif -- cgit v1.2.3