diff options
| -rw-r--r-- | src/server/game/AI/CoreAI/GameObjectAI.h | 4 | ||||
| -rw-r--r-- | src/server/game/AI/CreatureAI.h | 4 | ||||
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h index a44d8b1f3c6..8da5d34118f 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.h +++ b/src/server/game/AI/CoreAI/GameObjectAI.h @@ -97,11 +97,11 @@ class TC_GAME_API GameObjectAI // Called when hit by a spell virtual void SpellHit(Unit* /*caster*/, SpellInfo const* /*spellInfo*/) { } - virtual void SpellHit(GameObject* /*caster*/, SpellInfo const* /*spellInfo*/) { } + virtual void SpellHitByGameObject(GameObject* /*caster*/, SpellInfo const* /*spellInfo*/) { } // Called when spell hits a target virtual void SpellHitTarget(Unit* /*target*/, SpellInfo const* /*spellInfo*/) { } - virtual void SpellHitTarget(GameObject* /*target*/, SpellInfo const* /*spellInfo*/) { } + virtual void SpellHitTargetGameObject(GameObject* /*target*/, SpellInfo const* /*spellInfo*/) { } }; class TC_GAME_API NullGameObjectAI : public GameObjectAI diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index f2ff2ef4fb5..520a1542dfe 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -117,11 +117,11 @@ class TC_GAME_API CreatureAI : public UnitAI // Called when hit by a spell virtual void SpellHit(Unit* /*caster*/, SpellInfo const* /*spellInfo*/) { } - virtual void SpellHit(GameObject* /*caster*/, SpellInfo const* /*spellInfo*/) { } + virtual void SpellHitByGameObject(GameObject* /*caster*/, SpellInfo const* /*spellInfo*/) { } // Called when spell hits a target virtual void SpellHitTarget(Unit* /*target*/, SpellInfo const* /*spellInfo*/) { } - virtual void SpellHitTarget(GameObject* /*target*/, SpellInfo const* /*spellInfo*/) { } + virtual void SpellHitTargetGameObject(GameObject* /*target*/, SpellInfo const* /*spellInfo*/) { } virtual bool IsEscorted() const { return false; } diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 34bcb020e4b..8083c08479f 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2638,7 +2638,7 @@ void Spell::TargetInfo::DoDamageAndTriggers(Spell* spell) if (CreatureAI* hitTargetAI = cHitTarget->AI()) { if (spell->m_caster->GetTypeId() == TYPEID_GAMEOBJECT) - hitTargetAI->SpellHit(spell->m_caster->ToGameObject(), spell->m_spellInfo); + hitTargetAI->SpellHitByGameObject(spell->m_caster->ToGameObject(), spell->m_spellInfo); else hitTargetAI->SpellHit(spell->m_caster->ToUnit(), spell->m_spellInfo); } @@ -2689,15 +2689,15 @@ void Spell::GOTargetInfo::DoTargetSpellHit(Spell* spell, SpellEffectInfo const& if (go->AI()) { if (spell->m_caster->GetTypeId() == TYPEID_GAMEOBJECT) - go->AI()->SpellHit(spell->m_caster->ToGameObject(), spell->m_spellInfo); + go->AI()->SpellHitByGameObject(spell->m_caster->ToGameObject(), spell->m_spellInfo); else go->AI()->SpellHit(spell->m_caster->ToUnit(), spell->m_spellInfo); } if (spell->m_caster->GetTypeId() == TYPEID_UNIT && spell->m_caster->ToCreature()->IsAIEnabled()) - spell->m_caster->ToCreature()->AI()->SpellHitTarget(go, spell->m_spellInfo); + spell->m_caster->ToCreature()->AI()->SpellHitTargetGameObject(go, spell->m_spellInfo); else if (spell->m_caster->GetTypeId() == TYPEID_GAMEOBJECT && spell->m_caster->ToGameObject()->AI()) - spell->m_caster->ToGameObject()->AI()->SpellHitTarget(go, spell->m_spellInfo); + spell->m_caster->ToGameObject()->AI()->SpellHitTargetGameObject(go, spell->m_spellInfo); spell->CallScriptOnHitHandlers(); spell->CallScriptAfterHitHandlers(); |