diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Corpse.h | 4 | ||||
| -rw-r--r-- | src/game/Creature.h | 4 | ||||
| -rw-r--r-- | src/game/DynamicObject.h | 4 | ||||
| -rw-r--r-- | src/game/GameObject.h | 4 | ||||
| -rw-r--r-- | src/game/Level1.cpp | 8 |
5 files changed, 4 insertions, 20 deletions
diff --git a/src/game/Corpse.h b/src/game/Corpse.h index 200512f1cdf..4b0c6e7007c 100644 --- a/src/game/Corpse.h +++ b/src/game/Corpse.h @@ -82,10 +82,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 a5acdf3eaea..df37caa1ef2 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -540,10 +540,6 @@ class TRINITY_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 2eda623e36d..ccf9d47a455 100644 --- a/src/game/DynamicObject.h +++ b/src/game/DynamicObject.h @@ -50,10 +50,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 0213bcc9bf2..07f6c5a4362 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -444,10 +444,6 @@ class TRINITY_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 44818cfc7be..062f262a826 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -53,7 +53,7 @@ bool ChatHandler::HandleNpcSayCommand(const char* args) return false; } - pCreature->Say(args, LANG_UNIVERSAL, 0); + pCreature->MonsterSay(args, LANG_UNIVERSAL, 0); return true; } @@ -71,7 +71,7 @@ bool ChatHandler::HandleNpcYellCommand(const char* args) return false; } - pCreature->Yell(args, LANG_UNIVERSAL, 0); + pCreature->MonsterYell(args, LANG_UNIVERSAL, 0); return true; } @@ -91,7 +91,7 @@ bool ChatHandler::HandleNpcTextEmoteCommand(const char* args) return false; } - pCreature->TextEmote(args, 0); + pCreature->MonsterTextEmote(args, 0); return true; } @@ -119,7 +119,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; } |