From 3137a82c7cedb71f4a8ef06cb2d6e5741af65c9b Mon Sep 17 00:00:00 2001 From: QAston Date: Thu, 23 Jun 2011 13:28:52 +0200 Subject: Core/Spells: Cleanup in Spell.h: - Codestyle (fix function naming) and cleanup changes in SpellCastTargets class, also access variables of this class by getters/setters - Move IsQuestTameSpell function to SpellMgr.h - Move UnitList typedef to Unit.h Additionally - add missing copyright notice to SpellAuraEffects.h --- .../scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp | 5 +++-- src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp | 2 +- src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/server/scripts/Northrend') diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 3e66cf5ec8e..4a394cffe62 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -1478,9 +1478,10 @@ class spell_valanar_kinetic_bomb : public SpellScriptLoader void ChangeSummonPos(SpellEffIndex /*effIndex*/) { - WorldLocation* summonPos = GetTargetDest(); + WorldLocation summonPos = *GetTargetDest(); Position offset = {0.0f, 0.0f, 20.0f, 0.0f}; - summonPos->RelocateOffset(offset); // +20 in height + summonPos.RelocateOffset(offset); + SetTargetDest(summonPos); } void Register() diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 2dbca8f4f8f..ffc0b7fb026 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1260,7 +1260,7 @@ class spell_rimefang_icy_blast : public SpellScriptLoader void HandleTriggerMissile(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - if (Position* pos = GetTargetDest()) + if (Position const* pos = GetTargetDest()) if (TempSummon* summon = GetCaster()->SummonCreature(NPC_ICY_BLAST, *pos, TEMPSUMMON_TIMED_DESPAWN, 40000)) summon->CastSpell(summon, SPELL_ICY_BLAST_AREA, true); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp index 789c17b1b1f..73baeae441f 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp @@ -988,7 +988,7 @@ class spell_razorscale_devouring_flame : public SpellScriptLoader PreventHitDefaultEffect(effIndex); Unit* caster = GetCaster(); uint32 entry = uint32(GetSpellInfo()->EffectMiscValue[effIndex]); - WorldLocation* summonLocation = GetTargetDest(); + WorldLocation const* summonLocation = GetTargetDest(); if (!caster || !summonLocation) return; -- cgit v1.2.3