diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-09-07 18:03:33 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-09-07 18:03:33 +0200 |
| commit | 8a8ab0b4b681b45189330c1e5c382aa6fb968aa4 (patch) | |
| tree | a845b14987553d1fccaaf49ebabf215e3dd60d8e /src/server/game/Spells | |
| parent | 0098e98c69612151b16383b2ab9a9f57c72f50db (diff) | |
Core/DataStores: Updated DBC and DB2 structures to 6.2.2.20444
Diffstat (limited to 'src/server/game/Spells')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.h | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 7dad460ddcc..d10f76b76d3 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1508,7 +1508,7 @@ void Spell::DoCreateItem(uint32 /*i*/, uint32 itemtype) // send info to the client player->SendNewItem(pItem, num_to_add, true, bgType == 0); - if (pItem->GetQuality() > ITEM_QUALITY_EPIC || (pItem->GetQuality() == ITEM_QUALITY_EPIC && pItem->GetItemLevel(player) >= MinNewsItemLevel[sWorld->getIntConfig(CONFIG_EXPANSION)])) + if (pItem->GetQuality() > ITEM_QUALITY_EPIC || (pItem->GetQuality() == ITEM_QUALITY_EPIC && pItem->GetItemLevel(player) >= MinNewsItemLevel)) if (Guild* guild = player->GetGuild()) guild->AddGuildNews(GUILD_NEWS_ITEM_CRAFTED, player->GetGUID(), 0, pProto->GetId()); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 5e04bb46c53..9d5237fa591 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -28,6 +28,8 @@ #include "BattlefieldMgr.h" #include "Player.h" +PetFamilySpellsStore sPetFamilySpellsStore; + bool IsPrimaryProfessionSkill(uint32 skill) { SkillLineEntry const* pSkill = sSkillLineStore.LookupEntry(skill); diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index cf501df98c2..6264aafb021 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -547,6 +547,9 @@ typedef std::pair<SpellLearnSpellMap::const_iterator, SpellLearnSpellMap::const_ typedef std::multimap<uint32, SkillLineAbilityEntry const*> SkillLineAbilityMap; typedef std::pair<SkillLineAbilityMap::const_iterator, SkillLineAbilityMap::const_iterator> SkillLineAbilityMapBounds; +typedef std::set<uint32> PetFamilySpellsSet; +typedef std::map<uint32, PetFamilySpellsSet> PetFamilySpellsStore; + typedef std::multimap<uint32, uint32> PetLevelupSpellSet; typedef std::map<uint32, PetLevelupSpellSet> PetLevelupSpellMap; @@ -591,6 +594,8 @@ DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group); DiminishingLevels GetDiminishingReturnsMaxLevel(DiminishingGroup group); int32 GetDiminishingReturnsLimitDuration(SpellInfo const* spellproto); +extern PetFamilySpellsStore sPetFamilySpellsStore; + class SpellMgr { // Constructors |