aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorGyx <2359980687@qq.com>2012-03-16 21:41:15 +0800
committerGyx <2359980687@qq.com>2012-03-16 21:41:15 +0800
commitd8b4bc590a55d6c062f88275e21661f0b31078ad (patch)
treee4bd7fa8d6475a2cfb4f9564e855d289319e0c1c /src/server/scripts/Northrend
parente5afa4a950a2de40fd84f0e0fb1cc14468041087 (diff)
Core/Script: Code style and remove unused core.
Signed-off-by: Gyx <2359980687@qq.com>
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp4
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp7
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp2
3 files changed, 3 insertions, 10 deletions
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
index 547544fb754..eeba4a8717d 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
@@ -926,9 +926,7 @@ struct dummy_dragonAI : public ScriptedAI
if (instance && instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
instance->SetData(TYPE_SHADRON_PREKILLED, 1);
if (Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_SHADRON, 100.0f))
- {
pAcolyte->Kill(pAcolyte);
- }
break;
case NPC_VESPERON:
iTextId = SAY_VESPERON_DEATH;
@@ -936,9 +934,7 @@ struct dummy_dragonAI : public ScriptedAI
if (instance && instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
instance->SetData(TYPE_VESPERON_PREKILLED, 1);
if (Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_VESPERON, 100.0f))
- {
pAcolyte->Kill(pAcolyte);
- }
break;
}
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
index d5034e4827e..dd4a1c23d39 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
@@ -184,11 +184,8 @@ class boss_kologarn : public CreatureScript
if (Creature* rubbleStalker = who->FindNearestCreature(NPC_RUBBLE_STALKER, 70.0f))
{
- if (rubbleStalker)
- {
- rubbleStalker->CastSpell(rubbleStalker, SPELL_FALLING_RUBBLE, true);
- rubbleStalker->CastSpell(rubbleStalker, SPELL_SUMMON_RUBBLE, true);
- }
+ rubbleStalker->CastSpell(rubbleStalker, SPELL_FALLING_RUBBLE, true);
+ rubbleStalker->CastSpell(rubbleStalker, SPELL_SUMMON_RUBBLE, true);
}
if (!right && !left)
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
index e1f025f01c0..26ac516f209 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
@@ -445,6 +445,7 @@ public:
void AttackStart(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
+
void UpdateAI(const uint32 diff)
{
if (uiDespawnTimer <= diff)
@@ -455,7 +456,6 @@ public:
} else uiDespawnTimer -= diff;
}
};
-
};
void AddSC_boss_ingvar_the_plunderer()