aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorGyx <2359980687@qq.com>2012-03-16 20:31:23 +0800
committerGyx <2359980687@qq.com>2012-03-16 20:31:23 +0800
commitcd38e7df2ba09b20f1ea8d778e9b6fe1e0365740 (patch)
tree49e1989a0aef2a669405f2179d7291d9c1227fbe /src/server/scripts/Northrend
parentbef1b0c4028a3986d63c3b2c9ebdf532a3c73b5b (diff)
Core/Script: Code style.
Signed-off-by: Gyx <2359980687@qq.com>
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/grizzly_hills.cpp20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp
index d1ea6742298..86e925573ad 100644
--- a/src/server/scripts/Northrend/grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/grizzly_hills.cpp
@@ -194,9 +194,7 @@ public:
if (HasEscortState(STATE_ESCORT_ESCORTING))
{
if (m_uiChatTimer <= uiDiff)
- {
m_uiChatTimer = 12000;
- }
else
m_uiChatTimer -= uiDiff;
}
@@ -209,9 +207,7 @@ public:
{
DoScriptText(SAY_QUEST_ACCEPT, creature);
if (Creature* Mrfloppy = GetClosestCreatureWithEntry(creature, NPC_MRFLOPPY, 180.0f))
- {
Mrfloppy->GetMotionMaster()->MoveFollow(creature, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
- }
if (npc_escortAI* pEscortAI = CAST_AI(npc_emily::npc_emilyAI, (creature->AI())))
pEscortAI->Start(true, false, player->GetGUID());
@@ -318,7 +314,7 @@ public:
void SpellHit(Unit* pCaster, const SpellInfo* pSpell)
{
if (pSpell->Id == SPELL_OUTHOUSE_GROANS)
- {
+ {
++m_counter;
if (m_counter < 5)
DoCast(pCaster, SPELL_CAMERA_SHAKE, true);
@@ -503,7 +499,6 @@ public:
me->SetStandState(UNIT_STAND_STATE_STAND);
me->DespawnOrUnsummon(DespawnTimer);
}
-
}
}
@@ -511,6 +506,7 @@ public:
{
if (!UpdateVictim())
return;
+
DoMeleeAttackIfReady();
}
};
@@ -695,12 +691,12 @@ public:
void AddSC_grizzly_hills()
{
- new npc_emily;
- new npc_mrfloppy;
- new npc_outhouse_bunny;
- new npc_tallhorn_stag;
- new npc_amberpine_woodsman;
- new npc_wounded_skirmisher;
+ new npc_emily();
+ new npc_mrfloppy();
+ new npc_outhouse_bunny();
+ new npc_tallhorn_stag();
+ new npc_amberpine_woodsman();
+ new npc_wounded_skirmisher();
new npc_lightning_sentry();
new npc_venture_co_straggler();
}