aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/SpellMgr.cpp
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2018-01-18 00:53:45 -0300
committerariel- <ariel-@users.noreply.github.com>2018-01-18 01:07:29 -0300
commitb75ff7d4bf13fb4778843c99521223becc096ca0 (patch)
tree8caeb1afa4fd0367a41b90d7793625d7afb86528 /src/server/game/Spells/SpellMgr.cpp
parente519e14df8d846285f1d29fb7e5aa0b151c6f74e (diff)
Core/Globals: revert back to unordered_map for templates
Partial revert of commit b64c5043140dc7b7908e259e441de16cc0261320 See discussion on https://github.com/TrinityCore/TrinityCore/commit/b64c5043140dc7b7908e259e441de16cc0261320
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
-rw-r--r--src/server/game/Spells/SpellMgr.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index ca05c9c8b02..54d0ded9049 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -2270,22 +2270,22 @@ void SpellMgr::LoadPetDefaultSpells()
uint32 countData = 0;
CreatureTemplateContainer const& ctc = sObjectMgr->GetCreatureTemplates();
- for (auto const& creatureTemplate : ctc)
+ for (auto const& creatureTemplatePair : ctc)
{
- if (!creatureTemplate || !creatureTemplate->PetSpellDataId)
+ if (!creatureTemplatePair.second.PetSpellDataId)
continue;
// for creature with PetSpellDataId get default pet spells from dbc
- CreatureSpellDataEntry const* spellDataEntry = sCreatureSpellDataStore.LookupEntry(creatureTemplate->PetSpellDataId);
+ CreatureSpellDataEntry const* spellDataEntry = sCreatureSpellDataStore.LookupEntry(creatureTemplatePair.second.PetSpellDataId);
if (!spellDataEntry)
continue;
- int32 petSpellsId = -int32(creatureTemplate->PetSpellDataId);
+ int32 petSpellsId = -int32(creatureTemplatePair.second.PetSpellDataId);
PetDefaultSpellsEntry petDefSpells;
for (uint8 j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j)
petDefSpells.spellid[j] = spellDataEntry->spellId[j];
- if (LoadPetDefaultSpells_helper(creatureTemplate.get(), petDefSpells))
+ if (LoadPetDefaultSpells_helper(&creatureTemplatePair.second, petDefSpells))
{
mPetDefaultSpellsMap[petSpellsId] = petDefSpells;
++countData;