diff options
| author | megamage <none@none> | 2009-03-13 18:48:53 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-13 18:48:53 -0600 |
| commit | a5882ee84afb8484b23cbeda3c5e4ab130574449 (patch) | |
| tree | 8b713507200ffdc21931a9566212041fe256de55 /src/game/CreatureAI.cpp | |
| parent | 664fb612b4f87539a43632e31901e3b93f7aa3a0 (diff) | |
| parent | 62cdd39279e573f99bc49db45a043bd057372afc (diff) | |
*Merge.
*"Fix Glowing Blood" is not merged. Outdated patch?
--HG--
branch : trunk
Diffstat (limited to 'src/game/CreatureAI.cpp')
| -rw-r--r-- | src/game/CreatureAI.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp index 0fa85a4d9e2..3295c1149c5 100644 --- a/src/game/CreatureAI.cpp +++ b/src/game/CreatureAI.cpp @@ -63,7 +63,12 @@ void UnitAI::DoMeleeAttackIfReady() void PlayerAI::OnCharmed(bool apply) { me->IsAIEnabled = apply; } //Disable CreatureAI when charmed -void CreatureAI::OnCharmed(bool apply) { /*me->IsAIEnabled = !apply;*/ } +void CreatureAI::OnCharmed(bool apply) +{ + //me->IsAIEnabled = !apply;*/ + me->NeedChangeAI = true; + me->IsAIEnabled = false; +} void CreatureAI::MoveInLineOfSight(Unit *who) { |