HG 698.

--HG--
branch : trunk

2 files changed, 9 insertions, 4 deletions

diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp
index cd1e5788ebd..590118e7a8c 100644
--- a/src/bindings/scripts/include/sc_creature.cpp
+++ b/src/bindings/scripts/include/sc_creature.cpp
@@ -236,9 +236,14 @@ void ScriptedAI::DoCastSpell(Unit* who,SpellEntry const *spellInfo, bool trigger
     m_creature->CastSpell(who, spellInfo, triggered);
 }
 
-void ScriptedAI::DoSay(const char* text, uint32 language, Unit* target)
-{
-    if (target) m_creature->Say(text, language, target->GetGUID());
+void ScriptedAI::DoSay(const char* text, uint32 language, Unit* target, bool SayEmote)
+{
+	if (target)
+	{
+		m_creature->Say(text, language, target->GetGUID());
+		if(SayEmote)
+			m_creature->HandleEmoteCommand(EMOTE_ONESHOT_TALK);
+	}
     else m_creature->Say(text, language, 0);
 }
 
diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h
index 90a66911ac7..1878e6e11dc 100644
--- a/src/bindings/scripts/include/sc_creature.h
+++ b/src/bindings/scripts/include/sc_creature.h
@@ -124,7 +124,7 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
     void DoCastSpell(Unit* who,SpellEntry const *spellInfo, bool triggered = false);
 
     //Creature say
-    void DoSay(const char* text, uint32 language, Unit* target);
+    void DoSay(const char* text, uint32 language, Unit* target, bool SayEmote = false);
 
     //Creature Yell
     void DoYell(const char* text, uint32 language, Unit* target);