diff options
| author | Rat <gmstreetrat@gmail.com> | 2014-11-16 14:20:01 +0100 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2014-11-16 14:20:01 +0100 |
| commit | 588143b9b69a81eee69d5fb3b9690c8aafc1a38f (patch) | |
| tree | a5ff6545b7360592475e4272147216a43218e91c /src/server/game/Groups/Group.cpp | |
| parent | c375748b7636fe88f1daf37197dc9da3d4a674a1 (diff) | |
Core/Spells: Spell system updates (don't even try to compile this)
Diffstat (limited to 'src/server/game/Groups/Group.cpp')
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index c4e4b6f21ae..894f87f6145 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -54,7 +54,7 @@ Loot* Roll::getLoot() } Group::Group() : m_leaderGuid(), m_leaderName(""), m_groupType(GROUPTYPE_NORMAL), -m_dungeonDifficulty(DUNGEON_DIFFICULTY_NORMAL), m_raidDifficulty(RAID_DIFFICULTY_10MAN_NORMAL), +m_dungeonDifficulty(DIFFICULTY_NORMAL), m_raidDifficulty(DIFFICULTY_10_N), m_bgGroup(NULL), m_bfGroup(NULL), m_lootMethod(FREE_FOR_ALL), m_lootThreshold(ITEM_QUALITY_UNCOMMON), m_looterGuid(), m_masterLooterGuid(), m_subGroupsCounts(NULL), m_guid(), m_counter(0), m_maxEnchantingLevel(0), m_dbStoreId(0) { @@ -111,8 +111,8 @@ bool Group::Create(Player* leader) m_looterGuid = leaderGuid; m_masterLooterGuid.Clear(); - m_dungeonDifficulty = DUNGEON_DIFFICULTY_NORMAL; - m_raidDifficulty = RAID_DIFFICULTY_10MAN_NORMAL; + m_dungeonDifficulty = DIFFICULTY_NORMAL; + m_raidDifficulty = DIFFICULTY_10_N; if (!isBGGroup() && !isBFGroup()) { @@ -182,13 +182,13 @@ void Group::LoadGroupFromDB(Field* fields) uint32 diff = fields[13].GetUInt8(); if (diff >= MAX_DUNGEON_DIFFICULTY) - m_dungeonDifficulty = DUNGEON_DIFFICULTY_NORMAL; + m_dungeonDifficulty = DIFFICULTY_NORMAL; else m_dungeonDifficulty = Difficulty(diff); uint32 r_diff = fields[14].GetUInt8(); if (r_diff >= MAX_RAID_DIFFICULTY) - m_raidDifficulty = RAID_DIFFICULTY_10MAN_NORMAL; + m_raidDifficulty = DIFFICULTY_10_N; else m_raidDifficulty = Difficulty(r_diff); @@ -2008,7 +2008,7 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* SendMsgTo) if (method == INSTANCE_RESET_ALL) { // the "reset all instances" method can only reset normal maps - if (entry->IsRaid() || diff == DUNGEON_DIFFICULTY_HEROIC) + if (entry->IsRaid() || diff == DIFFICULTY_HEROIC) { ++itr; continue; |