Changeset 229 for trunk/src/game/GuildHandler.cpp

Timestamp:

11/19/08 13:48:34 (17 years ago)

Author:

yumileroy

Message:

[svn] *** Source: MaNGOS ***
* Fixed build extractor at Windows Vista. Author: Vladimir
* Fixed comment text and code indentifiers spelling. Author: Vladimir & Paradox.
* Access cached member lists in guild handlers instead of querying the DB. Author: Hunuza
* Small fixes in send/received packet and simple code cleanup also. Author: Vladimir
* Not output error at loading empty character_ticket table. Author: Vladimir
* Not reset display model at shapeshift aura remove if it not set at apply. Author: Arthorius
* Applied props to few files.

Original author: visagalis
Date: 2008-11-14 16:28:45-06:00

Files:

• trunk/src/game/GuildHandler.cpp (modified) (8 diffs)

trunk/src/game/GuildHandler.cpp

@@ -174 +174 @@
     }
     
-    uint64 plGuid = objmgr.GetPlayerGUIDByName(plName);
-
-    if(!plGuid)
-    {
-        SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_FOUND);
-        return;
-    }
-
-    if(plGuid == guild->GetLeader())
+    uint64 plGuid;
+    MemberSlot* slot = guild->GetMemberSlot(plName, plGuid);
+    if(!slot)
+    {
+        SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
+        return;
+    }
+
+    if(slot->RankId == GR_GUILDMASTER)
     {
         SendGuildCommandResult(GUILD_QUIT_S, "", GUILD_LEADER_LEAVE);
-        return;
-    }
-
-    if(!guild->IsMember(GUID_LOPART(plGuid)))
-    {
-        SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
         return;
     }
@@ -302 +296 @@
     }
     
-    uint64 plGuid = objmgr.GetPlayerGUIDByName(plName);
+    uint64 plGuid;
+    MemberSlot* slot = guild->GetMemberSlot(plName, plGuid);
+
+    if(!slot)
+    {
+        SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
+        return;
+    }
+
+    if(plGuid == GetPlayer()->GetGUID())
+    {
+        SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_NAME_INVALID);
+        return;
+    }
     
-    if(!plGuid)
-    {
-        SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_FOUND);
-        return;
-    }
-    else if(plGuid == GetPlayer()->GetGUID())
-    {
-        SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_NAME_INVALID);
-        return;
-    }
-    
-    int32 plRankId = guild->GetRank(GUID_LOPART(plGuid));
-    if(plRankId == -1)
-    {
-        SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
-        return;
-    }
-    if(plRankId < 2 || (plRankId-1) < GetPlayer()->GetRank())
-        return;
-
-    uint32 newRankId = plRankId < guild->GetNrRanks() ? plRankId-1 : guild->GetNrRanks()-1;
+    if(slot->RankId < 2 || (slot->RankId-1) < GetPlayer()->GetRank())
+        return;
+
+    uint32 newRankId = slot->RankId < guild->GetNrRanks() ? slot->RankId-1 : guild->GetNrRanks()-1;
 
     guild->ChangeRank(plGuid, newRankId);
@@ -366 +356 @@
     }
     
-    uint64 plGuid = objmgr.GetPlayerGUIDByName(plName);
-
-    if( !plGuid )
-    {
-        SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_FOUND);
+    uint64 plGuid;
+    MemberSlot* slot = guild->GetMemberSlot(plName, plGuid);
+
+    if (!slot)
+    {
+        SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
         return;
     }
@@ -380 +371 @@
     }
 
-    int32 plRankId = guild->GetRank(GUID_LOPART(plGuid));
-    if(plRankId == -1)
-    {
-        SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
-        return;
-    }
-
-    if((plRankId+1) >= guild->GetNrRanks() || plRankId <= this->GetPlayer()->GetRank())
-        return;
-
-    guild->ChangeRank(plGuid, (plRankId+1));
+    if((slot->RankId+1) >= guild->GetNrRanks() || slot->RankId <= GetPlayer()->GetRank())
+        return;
+
+    guild->ChangeRank(plGuid, (slot->RankId+1));
     // Put record into guildlog
-    guild->LogGuildEvent(GUILD_EVENT_LOG_DEMOTE_PLAYER, GetPlayer()->GetGUIDLow(), GUID_LOPART(plGuid), (plRankId+1));
+    guild->LogGuildEvent(GUILD_EVENT_LOG_DEMOTE_PLAYER, GetPlayer()->GetGUIDLow(), GUID_LOPART(plGuid), (slot->RankId+1));
 
     WorldPacket data(SMSG_GUILD_EVENT, (2+30));             // guess size
@@ -399 +383 @@
     data << GetPlayer()->GetName();
     data << plName;
-    data << guild->GetRankName(plRankId+1);
+    data << guild->GetRankName(slot->RankId+1);
     guild->BroadcastPacket(&data);
 }
@@ -498 +482 @@
     }
 
-    uint64 newLeaderGUID = objmgr.GetPlayerGUIDByName(name);
-    if (!newLeaderGUID)
-    {
-        SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_FOUND);
-        return;
-    }
-    if(!guild->IsMember(GUID_LOPART(newLeaderGUID)))
+    uint64 newLeaderGUID;
+    MemberSlot* slot = guild->GetMemberSlot(name, newLeaderGUID);
+
+    if (!slot)
     {
         SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_IN_GUILD_S);
@@ -584 +565 @@
     }
     
-    uint64 plGuid = objmgr.GetPlayerGUIDByName(name);
-
-    if (!plGuid)
-    {
-        SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_FOUND);
-        return;
-    }
-    
-    if (!guild->IsMember(GUID_LOPART(plGuid)))
+    uint64 plGuid;
+    MemberSlot* slot = guild->GetMemberSlot(name, plGuid);
+
+    if (!slot)
     {
         SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_IN_GUILD_S);
@@ -629 +605 @@
     }
     
-    uint64 plGuid = objmgr.GetPlayerGUIDByName(plName);
-
-    if (!plGuid)
-    {
-        SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_FOUND);
-        return;
-    }
+    uint64 plGuid;
+    MemberSlot* slot = guild->GetMemberSlot(plName, plGuid);
     
-    if (!guild->IsMember(GUID_LOPART(plGuid)))
+    if (!slot)
     {
         SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);