Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Fixed spell powers initialization

Browse Source
This commit is contained in:
Intel
2014-12-04 22:53:19 +02:00
parent e3fb937fdd
commit 60a6a8ba44
5 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/DataStores/DB2Stores.cpp
View File

@@ -39,6 +39,7 @@ DB2Storage<SpellCastingRequirementsEntry> sSpellCastingRequirementsStore(Spell
DB2Storage<SpellClassOptionsEntry> sSpellClassOptionsStore(SpellClassOptionsEntryfmt);
DB2Storage<SpellMiscEntry> sSpellMiscStore(SpellMiscEntryfmt);
DB2Storage<SpellPowerEntry> sSpellPowerStore(SpellPowerEntryfmt);
SpellPowerBySpellIDMap sSpellPowerBySpellIDStore;
DB2Storage<SpellReagentsEntry> sSpellReagentsStore(SpellReagentsEntryfmt);
DB2Storage<SpellRuneCostEntry> sSpellRuneCostStore(SpellRuneCostEntryfmt);
DB2Storage<SpellTotemsEntry> sSpellTotemsStore(SpellTotemsEntryfmt);
@@ -144,6 +145,10 @@ void LoadDB2Stores(std::string const& dataPath)
LoadDB2(availableDb2Locales, bad_db2_files, sTaxiPathStore, db2Path, "TaxiPath.db2");
LoadDB2(availableDb2Locales, bad_db2_files, sTaxiPathNodeStore, db2Path, "TaxiPathNode.db2");
for (uint32 i = 0; i < sSpellPowerStore.GetNumRows(); ++i)
if (SpellPowerEntry const* power = sSpellPowerStore.LookupEntry(i))
sSpellPowerBySpellIDStore[power->SpellID] = power;
for (uint32 i = 0; i < sPhaseGroupStore.GetNumRows(); ++i)
if (PhaseGroupEntry const* group = sPhaseGroupStore.LookupEntry(i))
if (PhaseEntry const* phase = sPhaseStore.LookupEntry(group->PhaseID))

1
src/server/game/DataStores/DB2Stores.h
View File

@@ -39,6 +39,7 @@ extern DB2Storage<SpellCastingRequirementsEntry> sSpellCastingRequirementsStore;
extern DB2Storage<SpellClassOptionsEntry> sSpellClassOptionsStore;
extern DB2Storage<SpellMiscEntry> sSpellMiscStore;
extern DB2Storage<SpellPowerEntry> sSpellPowerStore;
extern SpellPowerBySpellIDMap sSpellPowerBySpellIDStore;
extern DB2Storage<SpellReagentsEntry> sSpellReagentsStore;
extern DB2Storage<SpellRuneCostEntry> sSpellRuneCostStore;
extern DB2Storage<SpellTotemsEntry> sSpellTotemsStore;

2
src/server/game/DataStores/DB2Structure.h
View File

@@ -354,6 +354,8 @@ struct TaxiPathNodeEntry
typedef std::map<uint32, uint32> ItemDisplayIDMap;
typedef std::map<uint32, SpellPowerEntry const*> SpellPowerBySpellIDMap;
struct TaxiPathBySourceAndDestination
{
TaxiPathBySourceAndDestination() : ID(0), price(0) { }

6
src/server/game/Spells/SpellInfo.cpp
View File

@@ -880,7 +880,6 @@ SpellInfo::SpellInfo(SpellEntry const* spellEntry, SpellEffectEntryMap effects)
SpellEquippedItemsId = spellEntry->EquippedItemsID;
SpellInterruptsId = spellEntry->InterruptsID;
SpellLevelsId = spellEntry->LevelsID;
//SpellPowerId = spellEntry->PowerID;
SpellReagentsId = spellEntry->ReagentsID;
SpellShapeshiftId = spellEntry->ShapeshiftID;
SpellTargetRestrictionsId = spellEntry->TargetRestrictionsID;
@@ -2976,7 +2975,10 @@ SpellLevelsEntry const* SpellInfo::GetSpellLevels() const
SpellPowerEntry const* SpellInfo::GetSpellPower() const
{
return SpellPowerId ? sSpellPowerStore.LookupEntry(SpellPowerId) : NULL;
auto itr = sSpellPowerBySpellIDStore.find(Id);
if (itr != sSpellPowerBySpellIDStore.end())
return itr->second;
return NULL;
}
SpellReagentsEntry const* SpellInfo::GetSpellReagents() const

1
src/server/game/Spells/SpellInfo.h
View File

@@ -404,7 +404,6 @@ public:
uint32 SpellEquippedItemsId;
uint32 SpellInterruptsId;
uint32 SpellLevelsId;
uint32 SpellPowerId;
uint32 SpellReagentsId;
uint32 SpellShapeshiftId;
uint32 SpellTargetRestrictionsId;