aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Kalimdor
diff options
context:
space:
mode:
authorGiacomo Pozzoni <giacomopoz@gmail.com>2019-05-23 21:08:29 +0200
committerShauren <shauren.trinity@gmail.com>2021-12-07 00:02:03 +0100
commit5f545f540216d3b94c26e4aeda50c8bb8d5c3d74 (patch)
treef949771047c43242881593e94522783851415e5c /src/server/scripts/Kalimdor
parent54044bda8219e712eaec6148af4db6523386cc0f (diff)
3.3.5 gameobject summoner (#23289)
* Scripts/Misc: Change IsSummonedBy(Unit*) to IsSummonedBy(WorldObject*) * Scripts/Misc: Fix build * Core/TempSummons: Rename GetSummoner() to GetSummonerUnit() * Core/TempSummons: Add support to TempSummons::GetSummoner() to return GameObject too * Fix build * Core/TempSummons: Allow GameObject to be owner of TempSummon * Core/TempSummons: Add support to SAI for GameObject owner of TempSummon * Scripts/Misc: Fix no-pch build * Core/TempSummons: Implement PR comments (cherry picked from commit 797fba98e95da1236465a15061ec4122d7ec33fe)
Diffstat (limited to 'src/server/scripts/Kalimdor')
-rw-r--r--src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp2
-rw-r--r--src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp4
-rw-r--r--src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp2
-rw-r--r--src/server/scripts/Kalimdor/Firelands/firelands.cpp2
-rw-r--r--src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp4
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp2
6 files changed, 8 insertions, 8 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
index 3483aa98bbc..a00aac21945 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
@@ -128,7 +128,7 @@ public:
Initialize();
}
- void IsSummonedBy(Unit*) override
+ void IsSummonedBy(WorldObject*) override
{
DoZoneInCombat();
}
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
index b7301d1fb19..01c3876446f 100644
--- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
+++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
@@ -370,7 +370,7 @@ class npc_molten_barrage : public CreatureScript
me->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f, MOTION_SLOT_DEFAULT);
}
- void IsSummonedBy(Unit* /*summoner*/) override
+ void IsSummonedBy(WorldObject* /*summoner*/) override
{
DoCastAOE(SPELL_AGGRO_CLOSEST, true);
DoCast(me, SPELL_MOLTEN_BARRAGE_VISUAL);
@@ -558,7 +558,7 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader
PreventHitDefaultEffect(effIndex);
GetHitUnit()->GetMotionMaster()->MoveIdle();
if (TempSummon* summ = GetHitUnit()->ToTempSummon())
- if (Unit* summoner = summ->GetSummoner())
+ if (WorldObject* summoner = summ->GetSummoner())
GetHitUnit()->CastSpell(summoner, SPELL_GENERIC_DUMMY_CAST, TRIGGERED_FULL_MASK);
float angle = 0.0f;
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp
index ceda6ec369b..484548f59f9 100644
--- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp
+++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp
@@ -276,7 +276,7 @@ struct npc_shard_of_torment : public NullCreatureAI
{
npc_shard_of_torment(Creature* creature) : NullCreatureAI(creature) { }
- void IsSummonedBy(Unit* /*summoner*/) override
+ void IsSummonedBy(WorldObject* /*summoner*/) override
{
DoCastAOE(SPELL_TORMENT_PRE_VISUAL);
scheduler.Schedule(Milliseconds(4400), [this](TaskContext)
diff --git a/src/server/scripts/Kalimdor/Firelands/firelands.cpp b/src/server/scripts/Kalimdor/Firelands/firelands.cpp
index 6e430c524fb..a0071f85800 100644
--- a/src/server/scripts/Kalimdor/Firelands/firelands.cpp
+++ b/src/server/scripts/Kalimdor/Firelands/firelands.cpp
@@ -225,7 +225,7 @@ struct npc_firelands_magmakin : public ScriptedAI
{
npc_firelands_magmakin(Creature* creature) : ScriptedAI(creature) { }
- void IsSummonedBy(Unit* /*summoner*/) override
+ void IsSummonedBy(WorldObject* /*summoner*/) override
{
//Not actually sniffed behavior
Unit* target = me->SelectNearestTarget(50.0f, true);
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
index d92b75fa020..2d722d2a59b 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
@@ -281,7 +281,7 @@ class npc_omega_stance : public CreatureScript
{
npc_omega_stanceAI(Creature* creature) : ScriptedAI(creature) { }
- void IsSummonedBy(Unit* /*who*/) override
+ void IsSummonedBy(WorldObject* /*who*/) override
{
DoCast(me, SPELL_OMEGA_STANCE_SPIDER_TRIGGER, true);
}
@@ -304,7 +304,7 @@ class npc_alpha_beam : public CreatureScript
{
npc_alpha_beamAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { }
- void IsSummonedBy(Unit* /*summoner*/) override
+ void IsSummonedBy(WorldObject* /*summoner*/) override
{
if (Creature* anraphet = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_ANRAPHET_GUID)))
anraphet->CastSpell(me, SPELL_ALPHA_BEAMS_BACK_CAST);
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index 9f7f47791c5..68ea6fc178a 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -1282,7 +1282,7 @@ public:
void JustDied(Unit* /*killer*/) override
{
if (TempSummon* summon = me->ToTempSummon())
- if (Unit* summoner = summon->GetSummoner())
+ if (Unit* summoner = summon->GetSummonerUnit())
if (summoner->IsAIEnabled())
summoner->GetAI()->DoAction(ACTION_FLESH_TENTACLE_KILLED);
}