aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/EasternKingdoms/Stratholme
diff options
context:
space:
mode:
authorGyx <2359980687@qq.com>2012-03-31 18:56:37 +0800
committerGyx <2359980687@qq.com>2012-03-31 18:56:37 +0800
commitd9088c083cdf42124ac956d704c5fa7b5d98e185 (patch)
tree83115239db55a0e572505d368c2c0fbbf525b3f0 /src/server/scripts/EasternKingdoms/Stratholme
parent7efb63725853b7c2221a800bf6204dcf5635c63c (diff)
Core/Script: Code style and some rewriting.
JustDied(Unit* Killer) -> JustDied(Unit* killer) JustDied(Unit* /*Killer*/) -> JustDied(Unit* /*killer*/) JustDied(Unit* /*unit*/) -> JustDied(Unit* /*killer*/) JustDied(Unit* /*slayer*/)) -> JustDied(Unit* /*killer*/) JustDied(Unit* /*victim*/) -> JustDied(Unit* /*killer*/) JustDied(Unit* victim) -> JustDied(Unit* killer) JustDied(Unit* /*who*/) -> JustDied(Unit* /*killer*/) JustDied(Unit* who) -> JustDied(Unit* killer) JustDied(Unit*) -> JustDied(Unit* /*killer*/) Signed-off-by: Gyx <2359980687@qq.com>
Diffstat (limited to 'src/server/scripts/EasternKingdoms/Stratholme')
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp48
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp4
10 files changed, 36 insertions, 32 deletions
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
index 32da9334adf..85faa14900b 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
@@ -126,7 +126,7 @@ public:
summoned->AI()->AttackStart(target);
}
- void JustDied(Unit* /*Killer*/)
+ void JustDied(Unit* /*killer*/)
{
if (instance)
instance->SetData(TYPE_BARON, DONE);
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
index 46aa3c96176..106719d654f 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
@@ -67,7 +67,7 @@ public:
{
}
- void JustDied(Unit* /*Killer*/)
+ void JustDied(Unit* /*killer*/)
{
if (instance)
instance->SetData(TYPE_BARONESS, IN_PROGRESS);
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
index 2e97281b98f..01299ae06b6 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
@@ -103,7 +103,7 @@ public:
SummonRifleman_Timer = 15000;
}
- void JustDied(Unit* /*Victim*/)
+ void JustDied(Unit* /*killer*/)
{
me->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 240000);
me->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 240000);
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
index b2637c496b2..21e3e19d890 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
@@ -105,7 +105,7 @@ public:
me->UpdateEntry(NPC_DATHROHAN);
}
- void JustDied(Unit* /*Victim*/)
+ void JustDied(Unit* /*killer*/)
{
static uint32 uiCount = sizeof(m_aSummonPoint)/sizeof(SummonDef);
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
index b9b1ea6458f..37e0bd5757f 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
@@ -75,7 +75,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
- void JustDied(Unit* /*Killer*/)
+ void JustDied(Unit* /*killer*/)
{
me->SetDisplayId(MODEL_HUMAN);
}
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
index 61f1a100cfe..f8a10f06155 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
@@ -65,7 +65,7 @@ public:
{
}
- void JustDied(Unit* /*Killer*/)
+ void JustDied(Unit* /*killer*/)
{
if (instance)
instance->SetData(TYPE_PALLID, IN_PROGRESS);
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
index e8030248f43..c9a43edb66d 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
@@ -67,7 +67,7 @@ public:
{
}
- void JustDied(Unit* /*Killer*/)
+ void JustDied(Unit* /*killer*/)
{
if (instance)
instance->SetData(TYPE_NERUB, IN_PROGRESS);
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
index 99806e6cfdf..ebeda248331 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
@@ -96,30 +96,34 @@ public:
{
}
- void JustDied(Unit* Killer)
+ void JustDied(Unit* killer)
{
- if (instance)
+ if (!instance)
+ return;
+
+ switch (me->GetEntry())
{
- switch (me->GetEntry())
- {
- case SH_AELMAR:
- instance->SetData(TYPE_SH_AELMAR, 2);
- break;
- case SH_CATHELA:
- instance->SetData(TYPE_SH_CATHELA, 2);
- break;
- case SH_GREGOR:
- instance->SetData(TYPE_SH_GREGOR, 2);
- break;
- case SH_NEMAS:
- instance->SetData(TYPE_SH_NEMAS, 2);
- break;
- case SH_VICAR:
- instance->SetData(TYPE_SH_VICAR, 2);
- break;
- }
- if (instance->GetData(TYPE_SH_QUEST) && Killer->GetTypeId() == TYPEID_PLAYER)
- CAST_PLR(Killer)->KilledMonsterCredit(SH_QUEST_CREDIT, 0);
+ case SH_AELMAR:
+ instance->SetData(TYPE_SH_AELMAR, 2);
+ break;
+ case SH_CATHELA:
+ instance->SetData(TYPE_SH_CATHELA, 2);
+ break;
+ case SH_GREGOR:
+ instance->SetData(TYPE_SH_GREGOR, 2);
+ break;
+ case SH_NEMAS:
+ instance->SetData(TYPE_SH_NEMAS, 2);
+ break;
+ case SH_VICAR:
+ instance->SetData(TYPE_SH_VICAR, 2);
+ break;
+ }
+
+ if (instance->GetData(TYPE_SH_QUEST))
+ {
+ if (Player* player = killer->ToPlayer())
+ player->KilledMonsterCredit(SH_QUEST_CREDIT, 0);
}
}
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
index a2fe87beb04..3bb1ce7959d 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
@@ -63,7 +63,7 @@ public:
{
}
- void JustDied(Unit* /*Killer*/)
+ void JustDied(Unit* /*killer*/)
{
for (uint8 i = 0; i < 30; ++i)
{
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index 48bf4ae2305..7e167093e07 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -165,7 +165,7 @@ public:
summoned->CastSpell(summoned, SPELL_SOUL_FREED, false);
}
- void JustDied(Unit* /*Killer*/)
+ void JustDied(Unit* /*killer*/)
{
if (Tagged)
me->SummonCreature(ENTRY_FREED, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 300000);
@@ -230,7 +230,7 @@ public:
Tagged = true;
}
- void JustDied(Unit* /*Killer*/)
+ void JustDied(Unit* /*killer*/)
{
if (Tagged)
{