[7413] Fixed finally problems with node names localization in BattleGroundAB messages. Author: VladimirMangos

    Also fix build at some platforms.
Note: GetTrinityString should be removed in the future when AV is updated.

--HG--
branch : trunk

1 files changed, 5 insertions, 6 deletions

diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h
index d77577449c9..9d060f9d2c6 100644
--- a/src/game/BattleGround.h
+++ b/src/game/BattleGround.h
@@ -411,12 +411,7 @@ class BattleGround
         void YellToAll(Creature* creature, const char* text, uint32 language);
 
         template<class Do>
-        void BroadcastWorker(Do& _do)
-        {
-            for(std::map<uint64, BattleGroundPlayer>::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-                if(Player *plr = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER)))
-                    _do(plr);
-        }
+        void BroadcastWorker(Do& _do);
 
         void PlaySoundToTeam(uint32 SoundID, uint32 TeamID);
         void PlaySoundToAll(uint32 SoundID);
@@ -434,6 +429,9 @@ class BattleGround
         void SendMessageToAll(int32 entry, ChatMsg type, Player const* source = NULL);
         void PSendMessageToAll(int32 entry, ChatMsg type, Player const* source, ...  );
 
+        // specialized version with 2 string id args
+        void SendMessage2ToAll(int32 entry, ChatMsg type, Player const* source, int32 strId1 = 0, int32 strId2 = 0);
+
         /* Raid Group */
         Group *GetBgRaid(uint32 TeamID) const { return TeamID == ALLIANCE ? m_BgRaids[BG_TEAM_ALLIANCE] : m_BgRaids[BG_TEAM_HORDE]; }
         void SetBgRaid(uint32 TeamID, Group *bg_raid);
@@ -500,6 +498,7 @@ class BattleGround
 
         void DoorOpen(uint32 type);
         void DoorClose(uint32 type);
+        //to be removed
         const char *GetTrinityString(int32 entry);
 
         virtual bool HandlePlayerUnderMap(Player * /*plr*/) { return false; }