Core/CreatureTextMgr: send emote, sound with texts, return duration after chat so scriptsystem can handle timings, cleanup

--HG--
branch : trunk

1 files changed, 5 insertions, 8 deletions

diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h
index 70ad8b6f9b0..9d00d9cf400 100644
--- a/src/server/game/Texts/CreatureTextMgr.h
+++ b/src/server/game/Texts/CreatureTextMgr.h
@@ -22,11 +22,6 @@
 #include "Creature.h"
 #include "SharedDefines.h"
 
-/*
-N O T E S
-
-*/
-
 struct CreatureTextEntry
 {
     uint32 entry;
@@ -50,8 +45,6 @@ enum TextRange
     TEXT_RANGE_WORLD    = 4
 };
 
-
-
 typedef std::vector<CreatureTextEntry> CreatureTextGroup;              //texts in a group
 typedef UNORDERED_MAP<uint8, CreatureTextGroup> CreatureTextHolder;    //groups for a creature by groupid
 typedef UNORDERED_MAP<uint32, CreatureTextHolder> CreatureTextMap;     //all creatures by entry
@@ -70,7 +63,11 @@ class CreatureTextMgr
         void LoadCreatureTexts();
         CreatureTextMap  const& GetTextMap() const { return mTextMap; }
 
-        void SendChat(Creature* source, uint8 textGroup, uint64 whisperGuid = 0, ChatType msgtype = CHAT_TYPE_SAY, Language language = LANG_UNIVERSAL, TextRange range = TEXT_RANGE_NORMAL);
+        void SendSound(Creature* source,uint32 sound, ChatType msgtype, uint64 whisperGuid, TextRange range);
+        void SendEmote(Creature* source, uint32 emote);
+        
+        //if sent, returns the 'duration' of the text else 0 if error
+        uint32 SendChat(Creature* source, uint8 textGroup, uint64 whisperGuid = 0, ChatType msgtype = CHAT_TYPE_END, Language language = LANG_ADDON, TextRange range = TEXT_RANGE_NORMAL, uint32 sound = 0);
         void SendChatString(WorldObject* source, char const* text, ChatType msgtype = CHAT_TYPE_SAY, Language language = LANG_UNIVERSAL, uint64 whisperGuid = 0, TextRange range = TEXT_RANGE_NORMAL) const;
 
     private: