diff options
author | Michael <michaelneubert1988@gmail.com> | 2014-06-05 19:42:48 +0200 |
---|---|---|
committer | Michael <michaelneubert1988@gmail.com> | 2014-06-05 19:42:48 +0200 |
commit | 83c2e79d52a57ec670b439ed6f822dd18e0ac55e (patch) | |
tree | 774cb4f6a175e60ca979772559efa60411e9eff4 /src/server/game/AI/CreatureAI.cpp | |
parent | 289a5c4318c5509eafeb36389a81bddc2ed349ca (diff) | |
parent | 36102bea64d536b6ac04ac728c64321cfc5e55f2 (diff) |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/scripts/Spells/spell_paladin.cpp
Diffstat (limited to 'src/server/game/AI/CreatureAI.cpp')
-rw-r--r-- | src/server/game/AI/CreatureAI.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index dd8b42deb9f..ac9de00cd10 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -43,6 +43,11 @@ void CreatureAI::Talk(uint8 id, WorldObject const* whisperTarget /*= NULL*/) sCreatureTextMgr->SendChat(me, id, whisperTarget); } +void CreatureAI::TalkToMap(uint8 id, WorldObject const* whisperTarget /*= NULL*/) +{ + sCreatureTextMgr->SendChat(me, id, whisperTarget, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_MAP); +} + void CreatureAI::DoZoneInCombat(Creature* creature /*= NULL*/, float maxRangeToNearestTarget /* = 50.0f*/) { if (!creature) |