diff --git a/src/bindings/universal/ScriptMgr.h b/src/bindings/universal/ScriptMgr.h index feacffed8..7543c5b20 100644 --- a/src/bindings/universal/ScriptMgr.h +++ b/src/bindings/universal/ScriptMgr.h @@ -123,7 +123,7 @@ struct MANGOS_DLL_DECL ScriptedAI : public CreatureAI void DoSay(int32 text_id, uint32 language) { - m_creature->Say(text_id, language, ObjectGuid()); + m_creature->MonsterSay(text_id, language, ObjectGuid()); } void DoGoHome(); diff --git a/src/game/Corpse.h b/src/game/Corpse.h index cdb277c1e..2b49d0e8d 100644 --- a/src/game/Corpse.h +++ b/src/game/Corpse.h @@ -83,12 +83,6 @@ class Corpse : public WorldObject Player* lootRecipient; bool lootForBody; - void Say(int32 textId, uint32 language, ObjectGuid targetGuid) { MonsterSay(textId, language, targetGuid); } - void Yell(int32 textId, uint32 language, ObjectGuid targetGuid) { MonsterYell(textId, language, targetGuid); } - void TextEmote(int32 textId, ObjectGuid targetGuid) { MonsterTextEmote(textId, targetGuid); } - void Whisper(int32 textId, ObjectGuid targetGuid) { MonsterWhisper(textId, targetGuid); } - void YellToZone(int32 textId, uint32 language, ObjectGuid targetGuid) { MonsterYellToZone(textId,language, targetGuid); } - GridReference &GetGridRef() { return m_gridRef; } bool IsExpired(time_t t) const; diff --git a/src/game/Creature.h b/src/game/Creature.h index f13559c80..10628e935 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -524,12 +524,6 @@ class MANGOS_DLL_SPEC Creature : public Unit std::string GetScriptName() const; uint32 GetScriptId() const; - void Say(int32 textId, uint32 language, ObjectGuid targetGuid) { MonsterSay(textId, language, targetGuid); } - void Yell(int32 textId, uint32 language, ObjectGuid targetGuid) { MonsterYell(textId, language, targetGuid); } - void TextEmote(int32 textId, ObjectGuid targetGuid, bool IsBossEmote = false) { MonsterTextEmote(textId, targetGuid, IsBossEmote); } - void Whisper(int32 textId, ObjectGuid targetGuid, bool IsBossWhisper = false) { MonsterWhisper(textId, targetGuid, IsBossWhisper); } - void YellToZone(int32 textId, uint32 language, ObjectGuid targetGuid) { MonsterYellToZone(textId, language, targetGuid); } - // overwrite WorldObject function for proper name localization const char* GetNameForLocaleIdx(int32 locale_idx) const; diff --git a/src/game/DynamicObject.h b/src/game/DynamicObject.h index 248214e2a..98a79eb74 100644 --- a/src/game/DynamicObject.h +++ b/src/game/DynamicObject.h @@ -58,12 +58,6 @@ class DynamicObject : public WorldObject bool isVisibleForInState(Player const* u, WorldObject const* viewPoint, bool inVisibleList) const; - void Say(int32 textId, uint32 language, ObjectGuid targetGuid) { MonsterSay(textId, language, targetGuid); } - void Yell(int32 textId, uint32 language, ObjectGuid targetGuid) { MonsterYell(textId, language, targetGuid); } - void TextEmote(int32 textId, ObjectGuid targetGuid) { MonsterTextEmote(textId, targetGuid); } - void Whisper(int32 textId, ObjectGuid targetGuid) { MonsterWhisper(textId, targetGuid); } - void YellToZone(int32 textId, uint32 language, ObjectGuid targetGuid) { MonsterYellToZone(textId, language, targetGuid); } - GridReference &GetGridRef() { return m_gridRef; } protected: diff --git a/src/game/GameObject.h b/src/game/GameObject.h index 4c795d1d8..b6e69f7b1 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -597,12 +597,6 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject void UpdateRotationFields(float rotation2 = 0.0f, float rotation3 = 0.0f); - void Say(int32 textId, uint32 language, ObjectGuid targetGuid) { MonsterSay(textId, language, targetGuid); } - void Yell(int32 textId, uint32 language, ObjectGuid targetGuid) { MonsterYell(textId, language, targetGuid); } - void TextEmote(int32 textId, ObjectGuid targetGuid) { MonsterTextEmote(textId, targetGuid); } - void Whisper(int32 textId, ObjectGuid targetGuid) { MonsterWhisper(textId, targetGuid); } - void YellToZone(int32 textId, uint32 language, ObjectGuid targetGuid) { MonsterYellToZone(textId, language, targetGuid); } - // overwrite WorldObject function for proper name localization const char* GetNameForLocaleIdx(int32 locale_idx) const; diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp index 696a251f8..4e593be77 100644 --- a/src/game/WaypointMovementGenerator.cpp +++ b/src/game/WaypointMovementGenerator.cpp @@ -220,10 +220,10 @@ bool WaypointMovementGenerator::Update(Creature &creature, const uint3 break; } - creature.Say(behavior->textid[rand() % i], LANG_UNIVERSAL, ObjectGuid()); + creature.MonsterSay(behavior->textid[rand() % i], LANG_UNIVERSAL, ObjectGuid()); } else - creature.Say(behavior->textid[0], LANG_UNIVERSAL, ObjectGuid()); + creature.MonsterSay(behavior->textid[0], LANG_UNIVERSAL, ObjectGuid()); } } // wpBehaviour found diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index d7bf5e6aa..1b2e65eae 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10759" + #define REVISION_NR "10760" #endif // __REVISION_NR_H__