diff options
| author | Shauren <shauren.trinity@gmail.com> | 2021-10-10 19:02:52 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-10-10 19:02:52 +0200 |
| commit | 8147a42aefb5c94fb70205141e611d3100cbd99d (patch) | |
| tree | a15dd7c89f1f3e8c2c76e697ea8a0300b73a1c34 /src/server/game/Spells/SpellInfo.cpp | |
| parent | 2965d201ab5580a7c71279701b8523064a159077 (diff) | |
Core/Spells: Corrected spell visual fallback logic for spell difficulty entries
Diffstat (limited to 'src/server/game/Spells/SpellInfo.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 5c1606cd731..61e04f1c8e4 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1072,8 +1072,7 @@ SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] = {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 285 SPELL_EFFECT_MODIFY_KEYSTONE_2 }; -SpellInfo::SpellInfo(SpellNameEntry const* spellName, ::Difficulty difficulty, SpellInfoLoadHelper const& data, - std::vector<SpellLabelEntry const*> const& labels, SpellVisualVector&& visuals) +SpellInfo::SpellInfo(SpellNameEntry const* spellName, ::Difficulty difficulty, SpellInfoLoadHelper const& data) : Id(spellName->ID), Difficulty(difficulty) { _effects.reserve(32); @@ -1119,8 +1118,6 @@ SpellInfo::SpellInfo(SpellNameEntry const* spellName, ::Difficulty difficulty, S ShowFutureSpellPlayerConditionID = _misc->ShowFutureSpellPlayerConditionID; } - _visuals = std::move(visuals); - // SpellScalingEntry if (SpellScalingEntry const* _scaling = data.Scaling) { @@ -1210,7 +1207,7 @@ SpellInfo::SpellInfo(SpellNameEntry const* spellName, ::Difficulty difficulty, S ChannelInterruptFlags2 = SpellAuraInterruptFlags2(_interrupt->ChannelInterruptFlags[1]); } - for (SpellLabelEntry const* label : labels) + for (SpellLabelEntry const* label : data.Labels) Labels.insert(label->LabelID); // SpellLevelsEntry @@ -1255,6 +1252,8 @@ SpellInfo::SpellInfo(SpellNameEntry const* spellName, ::Difficulty difficulty, S std::copy(std::begin(_totem->RequiredTotemCategoryID), std::end(_totem->RequiredTotemCategoryID), TotemCategory.begin()); std::copy(std::begin(_totem->Totem), std::end(_totem->Totem), Totem.begin()); } + + _visuals = data.Visuals; } SpellInfo::SpellInfo(SpellNameEntry const* spellName, ::Difficulty difficulty, std::vector<SpellEffectEntry> const& effects) |