aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorclick <none@none>2010-12-13 22:37:56 +0100
committerclick <none@none>2010-12-13 22:37:56 +0100
commit26428943423d14e8672682ab1f19925b76c2aa35 (patch)
tree1c6d80c03cbf566879e5c899533a2dea5a73dd4c /src/server/scripts/Northrend
parent89a33bbf612fcd0d5cea8e1fc5deff87e53aa67e (diff)
Core: Add new system for parallelizing client packet processing. Handle WorldSession updates in Map::Update() where we are safe to proceed. Patch by Ambal.
(And clean up tabs and whitespace while rummaging around in there) Closes issue 5084. --HG-- branch : trunk
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp4
-rwxr-xr-xsrc/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp2
-rw-r--r--src/server/scripts/Northrend/borean_tundra.cpp6
-rw-r--r--src/server/scripts/Northrend/grizzly_hills.cpp6
-rw-r--r--src/server/scripts/Northrend/howling_fjord.cpp10
6 files changed, 15 insertions, 15 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
index 7e563aba735..154b814f3bb 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -70,7 +70,7 @@ enum eShadowmourne
SPELL_THIRST_QUENCHED = 72154,
};
-static const uint32 vampireAuras[3][MAX_DIFFICULTY] =
+static const uint32 vampireAuras[3][MAX_DIFFICULTY] =
{
{70867, 71473, 71532, 71533},
{70879, 71525, 71530, 71531},
@@ -468,7 +468,7 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader
{
GetCaster()->CastSpell(GetCaster(), SPELL_THIRST_QUENCHED, true);
GetCaster()->RemoveAura(aura);
- }
+ }
else
GetCaster()->CastSpell(GetCaster(), SPELL_GUSHING_WOUND, true);
}
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
index 49198ae8252..a38a499a109 100755
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
@@ -992,7 +992,7 @@ class spell_putricide_choking_gas_bomb : public SpellScriptLoader
{
if (i == skipIndex)
continue;
-
+
uint32 spellId = SpellMgr::CalculateSpellEffectAmount(GetSpellInfo(), uint8(i));
GetCaster()->CastSpell(GetCaster(), spellId, true, NULL, NULL, GetCaster()->GetGUID());
}
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
index b316424987b..8351b1b0b5c 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
@@ -369,7 +369,7 @@ class npc_big_ooze : public CreatureScript
break;
}
}
-
+
if (me->IsVisible())
DoMeleeAttackIfReady();
}
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index 55ed9e10348..5c5ea193cce 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -2497,7 +2497,7 @@ public:
uiEventPhase = 0;
}
break;
- }
+ }
}else uiEventTimer -= uiDiff;
if (!UpdateVictim())
@@ -2559,12 +2559,12 @@ public:
if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID());
-
+
return true;
}
};
-
+
void AddSC_borean_tundra()
{
new npc_sinkhole_kill_credit;
diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp
index 9649c73b800..e9a0d2c4701 100644
--- a/src/server/scripts/Northrend/grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/grizzly_hills.cpp
@@ -651,7 +651,7 @@ public:
struct npc_lightning_sentryAI : public ScriptedAI
{
npc_lightning_sentryAI(Creature *pCreature) : ScriptedAI(pCreature) { }
-
+
uint32 uiChargedSentryTotem;
void Reset()
@@ -709,7 +709,7 @@ class npc_venture_co_straggler : public CreatureScript
{
public:
npc_venture_co_straggler() : CreatureScript("npc_venture_co_straggler") { }
-
+
CreatureAI *GetAI(Creature *pCreature) const
{
return new npc_venture_co_stragglerAI(pCreature);
@@ -742,7 +742,7 @@ public:
switch (uiTimer)
{
case 0:
- if (pPlayer->GetQuestStatus(QUEST_SMOKE_EM_OUT_A) == QUEST_STATUS_INCOMPLETE ||
+ if (pPlayer->GetQuestStatus(QUEST_SMOKE_EM_OUT_A) == QUEST_STATUS_INCOMPLETE ||
pPlayer->GetQuestStatus(QUEST_SMOKE_EM_OUT_H) == QUEST_STATUS_INCOMPLETE)
pPlayer->KilledMonsterCredit(NPC_VENTURE_CO_STABLES_KC, 0);
me->GetMotionMaster()->MovePoint(0, me->GetPositionX()-7, me->GetPositionY()+7, me->GetPositionZ());
diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp
index d6d9e81175a..0d4751863d6 100644
--- a/src/server/scripts/Northrend/howling_fjord.cpp
+++ b/src/server/scripts/Northrend/howling_fjord.cpp
@@ -356,13 +356,13 @@ enum eDaegarnn
};
static float afSummon[] = {838.81f, -4678.06f, -94.182f};
-static float afCenter[] = {801.88f, -4721.87f, -96.143f};
+static float afCenter[] = {801.88f, -4721.87f, -96.143f};
class npc_daegarn : public CreatureScript
{
public:
npc_daegarn() : CreatureScript("npc_daegarn") { }
-
+
bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
{
if (pQuest->GetQuestId() == QUEST_DEFEAT_AT_RING)
@@ -373,10 +373,10 @@ public:
return true;
}
-
+
// TODO: make prisoners help (unclear if summoned or using npc's from surrounding cages (summon inside small cages?))
- struct npc_daegarnAI : public ScriptedAI
- {
+ struct npc_daegarnAI : public ScriptedAI
+ {
npc_daegarnAI(Creature *pCreature) : ScriptedAI(pCreature) { }
bool bEventInProgress;