diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-02-10 16:43:01 -0300 |
|---|---|---|
| committer | Ariel Silva <ariel-@users.noreply.github.com> | 2018-03-09 14:41:28 -0300 |
| commit | 45c5e1b9d63796d168339a44f63418f220cf2403 (patch) | |
| tree | c5c2ef9917147e38779d1f94e6ffc38386b9b251 /src/server/scripts/Northrend | |
| parent | 080d2c6cd439acb2059adc4e24a279de98aa0db6 (diff) | |
Core/Spells: rework part 5: GameObject casting
Closes #21330
Closes #18885
Ref #18752
Diffstat (limited to 'src/server/scripts/Northrend')
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp | 6 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index acf05493000..fa0015c02d2 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1865,12 +1865,12 @@ class spell_icc_sprit_alarm : public SpellScriptLoader return; } - if (GameObject* trap = GetCaster()->FindNearestGameObject(trapId, 5.0f)) + if (GameObject* trap = GetGObjCaster()->FindNearestGameObject(trapId, 5.0f)) trap->SetRespawnTime(trap->GetGOInfo()->GetAutoCloseTime() / IN_MILLISECONDS); std::list<Creature*> wards; - GetCaster()->GetCreatureListWithEntryInGrid(wards, NPC_DEATHBOUND_WARD, 150.0f); - wards.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); + GetGObjCaster()->GetCreatureListWithEntryInGrid(wards, NPC_DEATHBOUND_WARD, 150.0f); + wards.sort(Trinity::ObjectDistanceOrderPred(GetGObjCaster())); for (std::list<Creature*>::iterator itr = wards.begin(); itr != wards.end(); ++itr) { if ((*itr)->IsAlive() && (*itr)->HasAura(SPELL_STONEFORM)) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 1d58d2bf336..7286ae41ca5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -1308,7 +1308,7 @@ class go_ulduar_tower : public GameObjectScript InstanceScript* instance; - void Destroyed(Player* /*player*/, uint32 /*eventId*/) override + void Destroyed(WorldObject* /*attacker*/, uint32 /*eventId*/) override { switch (me->GetEntry()) { |