diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-22 20:06:40 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-22 20:06:40 +0200 |
| commit | 5bb19ce01787135bc9d1a2595ef20279e3da10e6 (patch) | |
| tree | 5e3319245e7ca3ba040b5065687f9fffaa9426ff /src/server/game/Texts/CreatureTextMgr.h | |
| parent | cec7c9f07e2c9ddf5382941c227c17fd08d5b903 (diff) | |
| parent | 583039c1c51ebd93975e47a1022343c626704832 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
Diffstat (limited to 'src/server/game/Texts/CreatureTextMgr.h')
| -rw-r--r-- | src/server/game/Texts/CreatureTextMgr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index 6ef983e18e5..99c31b0829d 100644 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -36,6 +36,7 @@ struct CreatureTextEntry Emote emote; uint32 duration; uint32 sound; + uint32 BroadcastTextId; }; enum CreatureTextRange @@ -186,7 +187,7 @@ void CreatureTextMgr::SendChatPacket(WorldObject* source, Builder const& builder case CHAT_MSG_MONSTER_WHISPER: case CHAT_MSG_RAID_BOSS_WHISPER: { - if (range == TEXT_RANGE_NORMAL) //ignores team and gmOnly + if (range == TEXT_RANGE_NORMAL) // ignores team and gmOnly { if (!whisperTarget || whisperTarget->GetTypeId() != TYPEID_PLAYER) return; |