From 4bb9b13e011631446d190a01f832178d5c7b7409 Mon Sep 17 00:00:00 2001 From: Warpten Date: Sun, 25 Nov 2012 14:01:51 +0100 Subject: Core/Guilds: Handle CMSG_GUILD_SET_GUILD_MASTER. You can now promote any guild member to the GuildMaster rank. Also enable talents inspection and automagically refusing guild invites. --- src/server/game/Guilds/Guild.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/server/game/Guilds/Guild.cpp') diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 903aac6e983..c91b5746e84 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1588,20 +1588,20 @@ void Guild::HandleSetEmblem(WorldSession* session, const EmblemInfo& emblemInfo) } } -void Guild::HandleSetLeader(WorldSession* session, std::string const& name) +void Guild::HandleSetNewGuildMaster(WorldSession* session, std::string const& name) { Player* player = session->GetPlayer(); - // Only leader can assign new leader + // Only the guild master can throne a new guild master if (!_IsLeader(player)) SendCommandResult(session, GUILD_COMMAND_CHANGE_LEADER, ERR_GUILD_PERMISSIONS); - // Old leader must be a member of guild - else if (Member* pOldLeader = GetMember(player->GetGUID())) + // Old GM must be a guild member + else if (Member* oldGuildMaster = GetMember(player->GetGUID())) { - // New leader must be a member of guild - if (Member* pNewLeader = GetMember(name)) + // Same for the new one + if (Member* newGuildMaster = GetMember(name)) { - _SetLeaderGUID(pNewLeader); - pOldLeader->ChangeRank(GR_OFFICER); + _SetLeaderGUID(newGuildMaster); + oldGuildMaster->ChangeRank(GR_INITIATE); _BroadcastEvent(GE_LEADER_CHANGED, 0, player->GetName().c_str(), name.c_str()); } } -- cgit v1.2.3