diff options
| author | megamage <none@none> | 2009-04-18 11:05:35 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-04-18 11:05:35 -0500 |
| commit | db65f3c111197342e864e296bd7b8b6369a11add (patch) | |
| tree | 2e33b59651749fd9bf1b2ffb1b443c37a353560e /src/game/Unit.cpp | |
| parent | 5629168dbbc658d44e8b12544b768ac23bf95991 (diff) | |
| parent | 60736b1f7da05e5eee5100edc3e80fbb9e228495 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index aa3dfc81af2..850ee996d14 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -10249,7 +10249,7 @@ void Unit::TauntApply(Unit* taunter) if (((Creature*)this)->IsAIEnabled) ((Creature*)this)->AI()->AttackStart(taunter); - m_ThreatManager.tauntApply(taunter); + //m_ThreatManager.tauntApply(taunter); } //====================================================================== @@ -10275,7 +10275,7 @@ void Unit::TauntFadeOut(Unit *taunter) return; } - m_ThreatManager.tauntFadeOut(taunter); + //m_ThreatManager.tauntFadeOut(taunter); target = m_ThreatManager.getHostilTarget(); if (target && target != taunter) |