aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2017-12-26 01:33:50 +0100
committerTreeston <treeston.mmoc@gmail.com>2017-12-26 01:33:50 +0100
commit60c756d3f8152eba0d0cab015e549778c9bb1660 (patch)
tree6ca63bdc6de3af48dc36c38342aabede5b4bc198 /src/server/scripts/Northrend
parent2a085562731267d1bdcd325c0f6f7d301b195bdc (diff)
Scripts/Various: Bringing nullptr civilization to the savages of master branch. Merry Christmas.
(2a08556 follow-up)
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp2
-rw-r--r--src/server/scripts/Northrend/zone_borean_tundra.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
index dfef623d708..3347462d330 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
@@ -1843,7 +1843,7 @@ class spell_igb_rocket_pack : public SpellScriptLoader
{
SpellInfo const* damageInfo = sSpellMgr->AssertSpellInfo(SPELL_ROCKET_PACK_DAMAGE);
GetTarget()->CastCustomSpell(SPELL_ROCKET_PACK_DAMAGE, SPELLVALUE_BASE_POINT0, 2 * (damageInfo->GetEffect(EFFECT_0)->CalcValue() + aurEff->GetTickNumber() * aurEff->GetPeriod()), NULL, TRIGGERED_FULL_MASK);
- GetTarget()->CastSpell(NULL, SPELL_ROCKET_BURST, TRIGGERED_FULL_MASK);
+ GetTarget()->CastSpell(nullptr, SPELL_ROCKET_BURST, TRIGGERED_FULL_MASK);
}
void Register() override
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index 48caa35a3b7..e065701c221 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -2433,7 +2433,7 @@ public:
{
if (GetTarget()->isDead())
if (Unit* caster = GetCaster())
- caster->CastSpell(NULL, SPELL_WINDSOUL_CREDT);
+ caster->CastSpell(nullptr, SPELL_WINDSOUL_CREDT);
}
void Register() override