From 1e38db574a50846f61ea16f346532b834770e1d5 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Tue, 10 May 2011 22:49:09 +0400 Subject: [PATCH] [11467] Reorder class Channel sections to default used in mangos --- src/game/Channel.cpp | 6 +-- src/game/Channel.h | 101 ++++++++++++++++++++------------------- src/game/ObjectMgr.h | 4 +- src/shared/revision_nr.h | 2 +- 4 files changed, 58 insertions(+), 55 deletions(-) diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp index 02c908748..d120ca543 100644 --- a/src/game/Channel.cpp +++ b/src/game/Channel.cpp @@ -624,7 +624,7 @@ void Channel::Invite(uint64 p, const char *newname) if(!newp->GetSocial()->HasIgnore(p)) { MakeInvite(&data, p); - SendToOne(&data, newp->GetGUID()); + SendToOne(&data, newp->GetObjectGuid()); data.clear(); } MakePlayerInvited(&data, newp->GetName()); @@ -667,9 +667,9 @@ void Channel::SendToAll(WorldPacket *data, uint64 p) plr->GetSession()->SendPacket(data); } -void Channel::SendToOne(WorldPacket *data, uint64 who) +void Channel::SendToOne(WorldPacket *data, ObjectGuid who) { - if (Player *plr = sObjectMgr.GetPlayer(who)) + if (Player *plr = ObjectMgr::GetPlayer(who)) plr->GetSession()->SendPacket(data); } diff --git a/src/game/Channel.h b/src/game/Channel.h index 353cc2291..b6ac8a340 100644 --- a/src/game/Channel.h +++ b/src/game/Channel.h @@ -20,6 +20,7 @@ #define _CHANNEL_H #include "Common.h" +#include "ObjectGuid.h" #include "WorldPacket.h" #include "Opcodes.h" #include "Player.h" @@ -145,17 +146,44 @@ class Channel } }; - typedef std::map PlayerList; - PlayerList players; - typedef std::set BannedList; - BannedList banned; - bool m_announce; - bool m_moderate; - std::string m_name; - std::string m_password; - uint8 m_flags; - uint32 m_channelId; - uint64 m_ownerGUID; + public: + Channel(const std::string& name, uint32 channel_id); + std::string GetName() const { return m_name; } + uint32 GetChannelId() const { return m_channelId; } + bool IsConstant() const { return m_channelId != 0; } + bool IsAnnounce() const { return m_announce; } + bool IsLFG() const { return GetFlags() & CHANNEL_FLAG_LFG; } + std::string GetPassword() const { return m_password; } + void SetPassword(const std::string& npassword) { m_password = npassword; } + void SetAnnounce(bool nannounce) { m_announce = nannounce; } + uint32 GetNumPlayers() const { return players.size(); } + uint8 GetFlags() const { return m_flags; } + bool HasFlag(uint8 flag) { return m_flags & flag; } + + void Join(uint64 p, const char *pass); + void Leave(uint64 p, bool send = true); + void KickOrBan(uint64 good, const char *badname, bool ban); + void Kick(uint64 good, const char *badname) { KickOrBan(good, badname, false); } + void Ban(uint64 good, const char *badname) { KickOrBan(good, badname, true); } + void UnBan(uint64 good, const char *badname); + void Password(uint64 p, const char *pass); + void SetMode(uint64 p, const char *p2n, bool mod, bool set); + void SetOwner(uint64 p, bool exclaim = true); + void SetOwner(uint64 p, const char *newname); + void SendWhoOwner(uint64 p); + void SetModerator(uint64 p, const char *newname) { SetMode(p, newname, true, true); } + void UnsetModerator(uint64 p, const char *newname) { SetMode(p, newname, true, false); } + void SetMute(uint64 p, const char *newname) { SetMode(p, newname, false, true); } + void UnsetMute(uint64 p, const char *newname) { SetMode(p, newname, false, false); } + void List(Player* p); + void Announce(uint64 p); + void Moderate(uint64 p); + void Say(uint64 p, const char *what, uint32 lang); + void Invite(uint64 p, const char *newp); + void Voice(uint64 guid1, uint64 guid2); + void DeVoice(uint64 guid1, uint64 guid2); + void JoinNotify(uint64 guid); // invisible notify + void LeaveNotify(uint64 guid); // invisible notify private: // initial packet data (notify type and channel name) @@ -199,7 +227,7 @@ class Channel void MakeVoiceOff(WorldPacket *data, uint64 guid); //+ 0x23 void SendToAll(WorldPacket *data, uint64 p = 0); - void SendToOne(WorldPacket *data, uint64 who); + void SendToOne(WorldPacket *data, ObjectGuid who); bool IsOn(uint64 who) const { return players.find(who) != players.end(); } bool IsBanned(uint64 guid) const { return banned.find(guid) != banned.end(); } @@ -239,43 +267,18 @@ class Channel } } - public: - Channel(const std::string& name, uint32 channel_id); - std::string GetName() const { return m_name; } - uint32 GetChannelId() const { return m_channelId; } - bool IsConstant() const { return m_channelId != 0; } - bool IsAnnounce() const { return m_announce; } - bool IsLFG() const { return GetFlags() & CHANNEL_FLAG_LFG; } - std::string GetPassword() const { return m_password; } - void SetPassword(const std::string& npassword) { m_password = npassword; } - void SetAnnounce(bool nannounce) { m_announce = nannounce; } - uint32 GetNumPlayers() const { return players.size(); } - uint8 GetFlags() const { return m_flags; } - bool HasFlag(uint8 flag) { return m_flags & flag; } + private: + bool m_announce; + bool m_moderate; + std::string m_name; + std::string m_password; + uint8 m_flags; + uint32 m_channelId; + uint64 m_ownerGUID; - void Join(uint64 p, const char *pass); - void Leave(uint64 p, bool send = true); - void KickOrBan(uint64 good, const char *badname, bool ban); - void Kick(uint64 good, const char *badname) { KickOrBan(good, badname, false); } - void Ban(uint64 good, const char *badname) { KickOrBan(good, badname, true); } - void UnBan(uint64 good, const char *badname); - void Password(uint64 p, const char *pass); - void SetMode(uint64 p, const char *p2n, bool mod, bool set); - void SetOwner(uint64 p, bool exclaim = true); - void SetOwner(uint64 p, const char *newname); - void SendWhoOwner(uint64 p); - void SetModerator(uint64 p, const char *newname) { SetMode(p, newname, true, true); } - void UnsetModerator(uint64 p, const char *newname) { SetMode(p, newname, true, false); } - void SetMute(uint64 p, const char *newname) { SetMode(p, newname, false, true); } - void UnsetMute(uint64 p, const char *newname) { SetMode(p, newname, false, false); } - void List(Player* p); - void Announce(uint64 p); - void Moderate(uint64 p); - void Say(uint64 p, const char *what, uint32 lang); - void Invite(uint64 p, const char *newp); - void Voice(uint64 guid1, uint64 guid2); - void DeVoice(uint64 guid1, uint64 guid2); - void JoinNotify(uint64 guid); // invisible notify - void LeaveNotify(uint64 guid); // invisible notify + typedef std::map PlayerList; + PlayerList players; + typedef std::set BannedList; + BannedList banned; }; #endif diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index 004cda60d..2cb99cafe 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -454,8 +454,8 @@ class ObjectMgr typedef UNORDERED_MAP WeatherZoneMap; - Player* GetPlayer(const char* name) const { return ObjectAccessor::FindPlayerByName(name);} - Player* GetPlayer(ObjectGuid guid) const { return ObjectAccessor::FindPlayer(guid); } + static Player* GetPlayer(const char* name) { return ObjectAccessor::FindPlayerByName(name);} + static Player* GetPlayer(ObjectGuid guid) { return ObjectAccessor::FindPlayer(guid); } static GameObjectInfo const *GetGameObjectInfo(uint32 id) { return sGOStorage.LookupEntry(id); } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b66210116..bb84e0fbe 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 "11466" + #define REVISION_NR "11467" #endif // __REVISION_NR_H__