diff --git a/src/bindings/universal/ScriptMgr.h b/src/bindings/universal/ScriptMgr.h index a05edf493..4da14aabd 100644 --- a/src/bindings/universal/ScriptMgr.h +++ b/src/bindings/universal/ScriptMgr.h @@ -136,9 +136,9 @@ struct MANGOS_DLL_DECL ScriptedAI : public CreatureAI m_creature->CastSpell(who,spellInfo,true); } - void DoSay(char const* text, uint32 language) + void DoSay(int32 text_id, uint32 language) { - m_creature->Say(text,language,0); + m_creature->Say(text_id,language,0); } void DoGoHome(); diff --git a/src/game/Corpse.h b/src/game/Corpse.h index 4bd71f12c..a072402e5 100644 --- a/src/game/Corpse.h +++ b/src/game/Corpse.h @@ -80,10 +80,6 @@ class Corpse : public WorldObject Player* lootRecipient; bool lootForBody; - void Say(const char* text, uint32 language, uint64 TargetGuid) { MonsterSay(text,language,TargetGuid); } - void Yell(const char* text, uint32 language, uint64 TargetGuid) { MonsterYell(text,language,TargetGuid); } - void TextEmote(const char* text, uint64 TargetGuid) { MonsterTextEmote(text,TargetGuid); } - void Whisper(const char* text, uint64 receiver) { MonsterWhisper(text,receiver); } void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); } void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); } void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); } diff --git a/src/game/Creature.h b/src/game/Creature.h index 73b5c4ae2..e6076dbbb 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -522,10 +522,6 @@ class MANGOS_DLL_SPEC Creature : public Unit void addGossipOption(GossipOption const& gso) { m_goptions.push_back(gso); } void setEmoteState(uint8 emote) { m_emoteState = emote; }; - void Say(const char* text, uint32 language, uint64 TargetGuid) { MonsterSay(text,language,TargetGuid); } - void Yell(const char* text, uint32 language, uint64 TargetGuid) { MonsterYell(text,language,TargetGuid); } - void TextEmote(const char* text, uint64 TargetGuid, bool IsBossEmote = false) { MonsterTextEmote(text,TargetGuid,IsBossEmote); } - void Whisper(const char* text, uint64 receiver, bool IsBossWhisper = false) { MonsterWhisper(text,receiver,IsBossWhisper); } void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); } void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); } void TextEmote(int32 textId, uint64 TargetGuid, bool IsBossEmote = false) { MonsterTextEmote(textId,TargetGuid,IsBossEmote); } diff --git a/src/game/DynamicObject.h b/src/game/DynamicObject.h index 6299fa782..7c1d821e1 100644 --- a/src/game/DynamicObject.h +++ b/src/game/DynamicObject.h @@ -48,10 +48,6 @@ class DynamicObject : public WorldObject void Delay(int32 delaytime); bool isVisibleForInState(Player const* u, bool inVisibleList) const; - void Say(const char* text, uint32 language, uint64 TargetGuid) { MonsterSay(text,language,TargetGuid); } - void Yell(const char* text, uint32 language, uint64 TargetGuid) { MonsterYell(text,language,TargetGuid); } - void TextEmote(const char* text, uint64 TargetGuid) { MonsterTextEmote(text,TargetGuid); } - void Whisper(const char* text, uint64 receiver) { MonsterWhisper(text,receiver); } void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); } void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); } void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); } diff --git a/src/game/GameObject.h b/src/game/GameObject.h index ae40f320b..404d20fac 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -441,10 +441,6 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject uint32 GetDBTableGUIDLow() const { return m_DBTableGuid; } - void Say(const char* text, uint32 language, uint64 TargetGuid) { MonsterSay(text,language,TargetGuid); } - void Yell(const char* text, uint32 language, uint64 TargetGuid) { MonsterYell(text,language,TargetGuid); } - void TextEmote(const char* text, uint64 TargetGuid) { MonsterTextEmote(text,TargetGuid); } - void Whisper(const char* text,uint64 receiver) { MonsterWhisper(text,receiver); } void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); } void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); } void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); } diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 0d2f24e6c..60781c47d 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -49,7 +49,7 @@ bool ChatHandler::HandleNpcSayCommand(const char* args) return false; } - pCreature->Say(args, LANG_UNIVERSAL, 0); + pCreature->MonsterSay(args, LANG_UNIVERSAL, 0); return true; } @@ -67,7 +67,7 @@ bool ChatHandler::HandleNpcYellCommand(const char* args) return false; } - pCreature->Yell(args, LANG_UNIVERSAL, 0); + pCreature->MonsterYell(args, LANG_UNIVERSAL, 0); return true; } @@ -87,7 +87,7 @@ bool ChatHandler::HandleNpcTextEmoteCommand(const char* args) return false; } - pCreature->TextEmote(args, 0); + pCreature->MonsterTextEmote(args, 0); return true; } @@ -115,7 +115,7 @@ bool ChatHandler::HandleNpcWhisperCommand(const char* args) if (HasLowerSecurity(objmgr.GetPlayer(receiver_guid), 0)) return false; - pCreature->Whisper(text,receiver_guid); + pCreature->MonsterWhisper(text,receiver_guid); return true; }