diff options
author | Spp <none@none> | 2010-12-05 17:50:26 +0100 |
---|---|---|
committer | Spp <none@none> | 2010-12-05 17:50:26 +0100 |
commit | e621f5fe98ac7f0c488ffb00b0d7844b7f4e27fd (patch) | |
tree | 7c44aeee468814baa1234d7d800d6b0ef3d14c81 /src/server/game/Groups/Group.cpp | |
parent | 71c2698faffb22fcfd0370370d80e180c70e3141 (diff) |
Core/Dungeon Finder: Code cleanup and minor optimizations
- Extend LfgState to keep control of the state of group and players using LFG
- Move scripts to its own class and initialize only if Dungeon finder is enabled
- Updated comments to doxygen format
- Use constructor initialization list
- All variables are declared in the inner most scope
- Fix some mem leaks
- Remove no longer needed code (Cleaner)
- Normalize handler function names
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Groups/Group.cpp')
-rwxr-xr-x | src/server/game/Groups/Group.cpp | 56 |
1 files changed, 12 insertions, 44 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 9244544e91a..78fe393e696 100755 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -53,24 +53,11 @@ Loot* Roll::getLoot() return getTarget(); } -Group::Group() -{ - m_leaderGuid = 0; - m_groupType = GroupType(0); - m_bgGroup = NULL; - m_lootMethod = LootMethod(0); - m_looterGuid = 0; - m_lootThreshold = ITEM_QUALITY_UNCOMMON; - m_subGroupsCounts = NULL; - m_guid = 0; - m_counter = 0; - m_maxEnchantingLevel= 0; - m_LfgQueued = false; - m_LfgStatus = LFG_STATUS_NOT_SAVED; - m_LfgDungeonEntry = 0; - m_Lfgkicks = 0; - m_LfgkicksActive = false; - +Group::Group() : m_leaderGuid(0), m_groupType(GROUPTYPE_NORMAL), m_bgGroup(NULL), +m_lootMethod(FREE_FOR_ALL), m_looterGuid(0), m_lootThreshold(ITEM_QUALITY_UNCOMMON), +m_subGroupsCounts(NULL), m_guid(0), m_counter(0), m_maxEnchantingLevel(0), +m_LfgState(LFG_STATE_NONE), m_LfgOldState(LFG_STATE_NONE), m_LfgDungeonEntry(0), m_Lfgkicks(0) +{ for (uint8 i = 0; i < TARGETICONCOUNT; ++i) m_targetIcons[i] = 0; } @@ -1119,7 +1106,7 @@ void Group::SendUpdate() data << uint8(citr->roles); if (isLFGGroup()) { - data << uint8(m_LfgStatus); + data << uint8(m_LfgState == LFG_STATE_FINISHED_DUNGEON ? 2 : 0); // FIXME - Dungeon save status? 2 = done data << uint32(m_LfgDungeonEntry); } @@ -1936,30 +1923,21 @@ void Group::SetLootThreshold(ItemQualities threshold) m_lootThreshold = threshold; } -void Group::SetLfgQueued(bool queued) +void Group::SetLfgState(LfgState state) { - m_LfgQueued = queued; + m_LfgState = state; } -bool Group::isLfgQueued() +LfgState Group::GetLfgState() { - return m_LfgQueued; + return m_LfgState; } -void Group::SetLfgStatus(uint8 status) +void Group::RestoreLfgState() { - m_LfgStatus = status; + m_LfgState = m_LfgOldState; } -uint8 Group::GetLfgStatus() -{ - return m_LfgStatus; -} - -bool Group::isLfgDungeonComplete() const -{ - return m_LfgStatus == LFG_STATUS_COMPLETE; -} void Group::SetLfgDungeonEntry(uint32 dungeonEntry) { @@ -1974,16 +1952,6 @@ uint32 Group::GetLfgDungeonEntry(bool id /* = true*/) return m_LfgDungeonEntry; } -bool Group::isLfgKickActive() const -{ - return m_LfgkicksActive; -} - -void Group::SetLfgKickActive(bool active) -{ - m_LfgkicksActive = active; -} - uint8 Group::GetLfgKicks() const { return m_Lfgkicks; |