diff options
| author | joschiwald <joschiwald.trinity@gmail.com> | 2014-09-19 03:16:59 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2014-09-19 03:16:59 +0200 |
| commit | 0f1f7ef4017ac32df669ceee120489321da680aa (patch) | |
| tree | b5def8f96e9d4a848f9a66eddedcc02739ce5132 /src/server/game/Battlefield/Battlefield.cpp | |
| parent | 5b363992ff26c33de4f797ea83d831e815901e33 (diff) | |
Core/Misc: multiple changes
* fixed build
* apply tc codestyle to ObjectGuid class
* fixed warning
Diffstat (limited to 'src/server/game/Battlefield/Battlefield.cpp')
| -rw-r--r-- | src/server/game/Battlefield/Battlefield.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index d54ce790c5b..3d725284cc1 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -357,10 +357,7 @@ void Battlefield::DoPlaySoundToAll(uint32 SoundID) data.Initialize(SMSG_PLAY_SOUND, 4); data << uint32(SoundID); - for (int team = 0; team < BG_TEAMS_COUNT; team++) - for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr) - if (Player* player = ObjectAccessor::FindPlayer(*itr)) - player->SendDirectMessage(&data); + BroadcastPacketToWar(data); } bool Battlefield::HasPlayer(Player* player) const @@ -443,18 +440,10 @@ void Battlefield::BroadcastPacketToWar(WorldPacket& data) const player->SendDirectMessage(&data); } -void Battlefield::SendWarningToAllInZone(uint32 entry) +void Battlefield::SendWarning(uint8 id, WorldObject const* target /*= nullptr*/) { if (Creature* stalker = GetCreature(StalkerGuid)) - // FIXME: replaced CHAT_TYPE_END with CHAT_MSG_BG_SYSTEM_NEUTRAL to fix compile, it's a guessed change :/ - sCreatureTextMgr->SendChat(stalker, (uint8) entry, NULL, CHAT_MSG_BG_SYSTEM_NEUTRAL, LANG_ADDON, TEXT_RANGE_ZONE); -} - -void Battlefield::SendWarningToPlayer(Player* player, uint32 entry) -{ - if (player) - if (Creature* stalker = GetCreature(StalkerGuid)) - sCreatureTextMgr->SendChat(stalker, (uint8)entry, player); + sCreatureTextMgr->SendChat(stalker, id, target); } void Battlefield::SendUpdateWorldState(uint32 field, uint32 value) |