Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bfa'

Browse Source
This commit is contained in:
Shauren
2018-12-09 14:45:03 +01:00
parent 8725eec9c1 a70030ff25
commit f94deace76
368 changed files with 180765 additions and 58686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Spells/SpellMgr.cpp
View File

@@ -2068,7 +2068,7 @@ void SpellMgr::LoadSpellAreas()
spellArea.questEndStatus = fields[4].GetUInt32();
spellArea.questEnd = fields[5].GetUInt32();
spellArea.auraSpell = fields[6].GetInt32();
spellArea.raceMask = fields[7].GetUInt32();
spellArea.raceMask = fields[7].GetUInt64();
spellArea.gender = Gender(fields[8].GetUInt8());
spellArea.flags = fields[9].GetUInt8();
@@ -2189,7 +2189,7 @@ void SpellMgr::LoadSpellAreas()
if (spellArea.raceMask && (spellArea.raceMask & RACEMASK_ALL_PLAYABLE) == 0)
{
TC_LOG_ERROR("sql.sql", "The spell %u listed in `spell_area` has wrong race mask (%u) requirement.", spell, spellArea.raceMask);
TC_LOG_ERROR("sql.sql", "The spell %u listed in `spell_area` has wrong race mask (" UI64FMTD ") requirement.", spell, spellArea.raceMask);
continue;
}
@@ -2236,7 +2236,7 @@ void SpellMgr::LoadSpellInfoStore()
uint32 oldMSTime = getMSTime();
UnloadSpellInfoStore();
mSpellInfoMap.resize(sSpellStore.GetNumRows(), NULL);
mSpellInfoMap.resize(sSpellNameStore.GetNumRows(), NULL);
std::unordered_map<uint32, SpellInfoLoadHelper> loadData;
std::unordered_map<int32, SpellEffectEntryMap> effectsBySpell;
@@ -2313,11 +2313,11 @@ void SpellMgr::LoadSpellInfoStore()
for (SpellXSpellVisualEntry const* visual : sSpellXSpellVisualStore)
visualsBySpell[visual->SpellID][visual->DifficultyID].push_back(visual);
for (uint32 i = 0; i < sSpellStore.GetNumRows(); ++i)
for (uint32 i = 0; i < sSpellNameStore.GetNumRows(); ++i)
{
if (SpellEntry const* spellEntry = sSpellStore.LookupEntry(i))
if (SpellNameEntry const* spellNameEntry = sSpellNameStore.LookupEntry(i))
{
loadData[i].Entry = spellEntry;
loadData[i].Entry = spellNameEntry;
mSpellInfoMap[i] = new SpellInfo(loadData[i], effectsBySpell[i], std::move(visualsBySpell[i]));
}
}