diff options
| author | Blaymoira <none@none> | 2008-12-27 21:27:41 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2008-12-27 21:27:41 +0100 |
| commit | 89f66acc87ac61e710742b154b3568ad1bf38517 (patch) | |
| tree | 2c737f5ae973577fb08377f95a2462deaf4d8f66 | |
| parent | 5d842d667bdc59db3f626fa5175c12f8e2f88ea0 (diff) | |
*Changes in function ScriptedAI::DoSay - by Lightguard
--HG--
branch : trunk
| -rw-r--r-- | sql/updates/679_world_scripts.sql (renamed from sql/updates/678_world_scripts.sql) | 0 | ||||
| -rw-r--r-- | src/bindings/scripts/include/sc_creature.cpp | 11 | ||||
| -rw-r--r-- | src/bindings/scripts/include/sc_creature.h | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/sql/updates/678_world_scripts.sql b/sql/updates/679_world_scripts.sql index 15d43204734..15d43204734 100644 --- a/sql/updates/678_world_scripts.sql +++ b/sql/updates/679_world_scripts.sql 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); |
