aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2019-04-27 23:38:48 +0200
committerjackpoz <giacomopoz@gmail.com>2019-04-27 23:48:39 +0200
commite3a9a9bfb2cba3fc1f6ed616b07fb0ea88de461f (patch)
tree0c4ae7f0540415a29eed9a956cfac4496d1c8639
parent71d15ea25be3e86646faaa3266617a0b8177972f (diff)
Core/Scripts: Rename recent GameObject spell overloads to fix GCC warnings
Rename recent GameObject spell overloads (they used to accept only Unit as parameters) to fix GCC warnings about partial function override.
-rw-r--r--src/server/game/AI/CoreAI/GameObjectAI.h4
-rw-r--r--src/server/game/AI/CreatureAI.h4
-rw-r--r--src/server/game/Spells/Spell.cpp8
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 6be1b740b31..7d8b2e2f77e 100644
--- a/src/server/game/AI/CoreAI/GameObjectAI.h
+++ b/src/server/game/AI/CoreAI/GameObjectAI.h
@@ -87,11 +87,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 aaeb6169dda..e8406722608 100644
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@@ -125,11 +125,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 d3ef850bd5d..aa567e1b5e3 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -2544,7 +2544,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);
}
@@ -2595,15 +2595,15 @@ void Spell::GOTargetInfo::DoTargetSpellHit(Spell* spell, uint8 effIndex)
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();