aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/SpellMgr.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-07-04 19:47:58 +0200
committerShauren <shauren.trinity@gmail.com>2015-07-04 19:47:58 +0200
commitb08b3b93e29bc4ad8faf766a97f1f918ba96f64c (patch)
tree93f75d7e42e7b71818781b5357d5340e7a51972e /src/server/game/Spells/SpellMgr.cpp
parent3f9b684231f83a8d4158ec3441488f6f216dcb1d (diff)
Core/DataStores: Removed CreatureSpellData.dbc, it is not used anymore
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
-rw-r--r--src/server/game/Spells/SpellMgr.cpp32
1 files changed, 1 insertions, 31 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 4f73eee601f..c100e34acb1 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -2509,32 +2509,6 @@ void SpellMgr::LoadPetDefaultSpells()
uint32 countCreature = 0;
uint32 countData = 0;
- CreatureTemplateContainer const* ctc = sObjectMgr->GetCreatureTemplates();
- for (CreatureTemplateContainer::const_iterator itr = ctc->begin(); itr != ctc->end(); ++itr)
- {
-
- if (!itr->second.PetSpellDataId)
- continue;
-
- // for creature with PetSpellDataId get default pet spells from dbc
- CreatureSpellDataEntry const* spellDataEntry = sCreatureSpellDataStore.LookupEntry(itr->second.PetSpellDataId);
- if (!spellDataEntry)
- continue;
-
- int32 petSpellsId = -int32(itr->second.PetSpellDataId);
- PetDefaultSpellsEntry petDefSpells;
- for (uint8 j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j)
- petDefSpells.spellid[j] = spellDataEntry->Spells[j];
-
- if (LoadPetDefaultSpells_helper(&itr->second, petDefSpells))
- {
- mPetDefaultSpellsMap[petSpellsId] = petDefSpells;
- ++countData;
- }
- }
-
- TC_LOG_INFO("server.loading", ">> Loaded addition spells for %u pet spell data entries in %u ms", countData, GetMSTimeDiffToNow(oldMSTime));
-
TC_LOG_INFO("server.loading", "Loading summonable creature templates...");
oldMSTime = getMSTime();
@@ -2554,11 +2528,7 @@ void SpellMgr::LoadPetDefaultSpells()
if (!cInfo)
continue;
- // already loaded
- if (cInfo->PetSpellDataId)
- continue;
-
- // for creature without PetSpellDataId get default pet spells from creature_template
+ // get default pet spells from creature_template
int32 petSpellsId = cInfo->Entry;
if (mPetDefaultSpellsMap.find(cInfo->Entry) != mPetDefaultSpellsMap.end())
continue;