diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-12-07 20:06:02 +0100 |
|---|---|---|
| committer | MitchesD <majklprofik@seznam.cz> | 2016-01-15 20:34:27 +0100 |
| commit | 2f1bd93c9e943e584bcd576261da200eec91747f (patch) | |
| tree | 954fdcb524341c892f9646e7c36ecaacc69830d1 /src/server/game/AI | |
| parent | a0719b75f33a81b3258008a4f0e9959bdae1e5d9 (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/game/AI')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 41254f56765..519d48c5e6e 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1001,7 +1001,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u { if (me && !me->isDead()) { - me->Kill(me); + me->KillSelf(); TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction: SMART_ACTION_DIE: %s", me->GetGUID().ToString().c_str()); } break; @@ -1282,7 +1282,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u if (!IsUnit(*itr)) continue; - (*itr)->ToUnit()->Kill((*itr)->ToUnit()); + (*itr)->ToUnit()->KillSelf(); } delete targets; |