diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp index aa33316db..3034af4a5 100644 --- a/src/game/Channel.cpp +++ b/src/game/Channel.cpp @@ -579,7 +579,7 @@ void Channel::Say(uint64 p, const char *what, uint32 lang) data << what; data << uint8(plr ? plr->chatTag() : 0); - SendToAll(&data, !players[p].IsModerator() ? p : false); + SendToAll(&data, !players[p].IsModerator() ? p : 0); } } @@ -664,33 +664,14 @@ void Channel::SetOwner(uint64 guid, bool exclaim) void Channel::SendToAll(WorldPacket *data, uint64 p) { for(PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) - { - Player *plr = sObjectMgr.GetPlayer(i->first); - if(plr) - { + if (Player *plr = sObjectMgr.GetPlayer(i->first)) if(!p || !plr->GetSocial()->HasIgnore(p)) plr->GetSession()->SendPacket(data); - } - } -} - -void Channel::SendToAllButOne(WorldPacket *data, uint64 who) -{ - for(PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) - { - if(i->first != who) - { - Player *plr = sObjectMgr.GetPlayer(i->first); - if(plr) - plr->GetSession()->SendPacket(data); - } - } } void Channel::SendToOne(WorldPacket *data, uint64 who) { - Player *plr = sObjectMgr.GetPlayer(who); - if(plr) + if (Player *plr = sObjectMgr.GetPlayer(who)) plr->GetSession()->SendPacket(data); } diff --git a/src/game/Channel.h b/src/game/Channel.h index ee206cfd1..353cc2291 100644 --- a/src/game/Channel.h +++ b/src/game/Channel.h @@ -199,7 +199,6 @@ class Channel void MakeVoiceOff(WorldPacket *data, uint64 guid); //+ 0x23 void SendToAll(WorldPacket *data, uint64 p = 0); - void SendToAllButOne(WorldPacket *data, uint64 who); void SendToOne(WorldPacket *data, uint64 who); bool IsOn(uint64 who) const { return players.find(who) != players.end(); } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 97d311dd1..7c2a17719 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 "11004" + #define REVISION_NR "11005" #endif // __REVISION_NR_H__