diff options
| author | Shauren <shauren.trinity@gmail.com> | 2021-09-04 14:21:02 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-09-04 14:21:02 +0200 |
| commit | 325bdc0ab0707895abb1effa7044c3f168513344 (patch) | |
| tree | f52f46e6992d696aeb1260f0fff67f1b4c8ce990 /src/server/scripts/World | |
| parent | 0e12e23f7784b4a80d3515cb094342cb677e35b2 (diff) | |
Core/Spells: Remove remaining direct accesses to SpellInfo::Effects
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/go_scripts.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/World/npc_professions.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 82823ae34f6..09c86e6222a 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -457,7 +457,7 @@ class go_soulwell : public GameObjectScript if (!spellInfo) return; - _stoneId = spellInfo->Effects[EFFECT_0].ItemType; + _stoneId = spellInfo->GetEffect(EFFECT_0).ItemType; } bool OnGossipHello(Player* player) override @@ -1278,4 +1278,4 @@ void AddSC_go_scripts() new go_darkmoon_faire_music(); new go_pirate_day_music(); new go_bells(); -}
\ No newline at end of file +} diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 48722939fe2..24db82461be 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -247,9 +247,9 @@ bool EquippedOk(Player* player, uint32 spellId) if (!spell) return false; - for (uint8 i = 0; i < 3; ++i) + for (SpellEffectInfo const& spellEffectInfo : spell->GetEffects()) { - uint32 reqSpell = spell->Effects[i].TriggerSpell; + uint32 reqSpell = spellEffectInfo.TriggerSpell; if (!reqSpell) continue; diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index c2d8e1e2c16..a8db91ca644 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1934,8 +1934,8 @@ public: SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); - if (spellInfo && spellInfo->Effects[0].Effect == SPELL_EFFECT_SUMMON_OBJECT_WILD) - return spellInfo->Effects[0].MiscValue; + if (spellInfo && spellInfo->GetEffect(EFFECT_0).Effect == SPELL_EFFECT_SUMMON_OBJECT_WILD) + return spellInfo->GetEffect(EFFECT_0).MiscValue; return 0; } |