aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/EasternKingdoms/ScarletEnclave
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2015-12-07 20:06:02 +0100
committerMitchesD <majklprofik@seznam.cz>2016-01-15 20:34:27 +0100
commit2f1bd93c9e943e584bcd576261da200eec91747f (patch)
tree954fdcb524341c892f9646e7c36ecaacc69830d1 /src/server/scripts/EasternKingdoms/ScarletEnclave
parenta0719b75f33a81b3258008a4f0e9959bdae1e5d9 (diff)
Core/Unit: Add Unit::KillSelf() overload
Add Unit::KillSelf() function as overload of Unit::Kill(this) . Use KillSelf() whenever the killer and the victim are the same to clearly state the Unit is going to kill itself. (cherry picked from commit 3267c90102068ed88c0bd7146ae747fe8ba44771) # Conflicts: # src/server/game/AI/SmartScripts/SmartScript.cpp
Diffstat (limited to 'src/server/scripts/EasternKingdoms/ScarletEnclave')
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
index e3de90ed6d3..acfdf0523f4 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
@@ -1218,7 +1218,7 @@ public:
if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID)) // Lich king disappears here
{
temp->AI()->Talk(EMOTE_LIGHT_OF_DAWN17);
- temp->Kill(temp);
+ temp->KillSelf();
}
JumpToNextStep(10000);
break;
@@ -1633,7 +1633,7 @@ public:
if (temp->IsAlive())
{
temp->SetVisible(false);
- temp->Kill(temp);
+ temp->KillSelf();
}
}
};