Changeset 132 for trunk/src/game/Group.cpp

Timestamp:

11/19/08 13:39:06 (17 years ago)

Author:

yumileroy

Message:

[svn] * Added npc follow, waterwalk, repairitems commands. Patch by dythzer
* Prevent adding more than 5 people to raid - Apoc
* fixed typo from one of our previous commits.
* Fixed two strings in core, thanx to warhead for patch.

Original author: KingPin?
Date: 2008-10-29 17:09:32-05:00

Files:

• trunk/src/game/Group.cpp (modified) (18 diffs)

trunk/src/game/Group.cpp

@@ -45 +45 @@
     m_looterGuid        = 0;
     m_lootThreshold     = ITEM_QUALITY_UNCOMMON;
+        m_subGroupsCounts   = NULL;
 
     for(int i=0; i<TARGETICONCOUNT; i++)
@@ -74 +75 @@
         for(BoundInstancesMap::iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end(); ++itr)
             itr->second.save->RemoveGroup(this);
+        if (m_subGroupsCounts)
+                delete[] m_subGroupsCounts;
 }
 
@@ -82 +85 @@
 
     m_groupType  = isBGGroup() ? GROUPTYPE_RAID : GROUPTYPE_NORMAL;
+        
+        if (m_groupType == GROUPTYPE_RAID)
+                _initRaidSubGroupsCounter();
+                
     m_lootMethod = GROUP_LOOT;
     m_lootThreshold = ITEM_QUALITY_UNCOMMON;
@@ -137 +144 @@
 
     m_groupType  = (*result)[13].GetBool() ? GROUPTYPE_RAID : GROUPTYPE_NORMAL;
+        
+        if (m_groupType == GROUPTYPE_RAID)
+                _initRaidSubGroupsCounter();
+                
     m_difficulty = (*result)[14].GetUInt8();
     m_mainTank = (*result)[0].GetUInt64();
@@ -179 +190 @@
     member.assistant = assistant;
     m_memberSlots.push_back(member);
+        
+        SubGroupCounterIncrease(subgroup);
+        
     return true;
+}
+
+void Group::ConvertToRaid()
+{
+        m_groupType = GROUPTYPE_RAID;
+        
+        _initRaidSubGroupsCounter();
+        
+        if(!isBGGroup()) CharacterDatabase.PExecute("UPDATE groups SET isRaid = 1 WHERE leaderGuid='%u'", GUID_LOPART(m_leaderGuid));
+        SendUpdate();
 }
 
@@ -387 +411 @@
 }
 
-void Group::SendLootRoll(uint64 SourceGuid, uint64 TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r)
+void Group::SendLootRoll(const uint64& SourceGuid, const uint64& TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r)
 {
     WorldPacket data(SMSG_LOOT_ROLL, (8+4+8+4+4+4+1+1));
@@ -411 +435 @@
 }
 
-void Group::SendLootRollWon(uint64 SourceGuid, uint64 TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r)
+void Group::SendLootRollWon(const uint64& SourceGuid, const uint64& TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r)
 {
     WorldPacket data(SMSG_LOOT_ROLL_WON, (8+4+4+4+4+8+1+1));
@@ -454 +478 @@
 }
 
-void Group::GroupLoot(uint64 playerGUID, Loot *loot, Creature *creature)
+void Group::GroupLoot(const uint64& playerGUID, Loot *loot, Creature *creature)
 {
     std::vector<LootItem>::iterator i;
@@ -510 +534 @@
 }
 
-void Group::NeedBeforeGreed(uint64 playerGUID, Loot *loot, Creature *creature)
+void Group::NeedBeforeGreed(const uint64& playerGUID, Loot *loot, Creature *creature)
 {
     ItemPrototype const *item;
@@ -564 +588 @@
 }
 
-void Group::MasterLoot(uint64 playerGUID, Loot* /*loot*/, Creature *creature)
+void Group::MasterLoot(const uint64& playerGUID, Loot* /*loot*/, Creature *creature)
 {
     Player *player = objmgr.GetPlayer(playerGUID);
@@ -600 +624 @@
 }
 
-void Group::CountRollVote(uint64 playerGUID, uint64 Guid, uint32 NumberOfPlayers, uint8 Choise)
+void Group::CountRollVote(const uint64& playerGUID, const uint64& Guid, uint32 NumberOfPlayers, uint8 Choise)
 {
     Rolls::iterator rollI = GetRoll(Guid);
@@ -936 +960 @@
     // get first not-full group
     uint8 groupid = 0;
-    std::vector<uint8> temp(MAXRAIDSIZE/MAXGROUPSIZE);
-    for(member_citerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr)
-    {
-        if (itr->group >= temp.size()) continue;
-        ++temp[itr->group];
-        if(temp[groupid] >= MAXGROUPSIZE)
-            ++groupid;
+    if (m_subGroupsCounts)
+    {
+        bool groupFound = false;
+                for (; groupid < MAXRAIDSIZE/MAXGROUPSIZE; ++groupid)
+                {
+                        if (m_subGroupsCounts[groupid] < MAXGROUPSIZE)
+                        {
+                                groupFound = true;
+                                break;
+                        }
+                }
+                // We are raid group and no one slot is free
+                if (!groupFound)
+                                return false;
     }
 
@@ -964 +995 @@
     member.assistant = isAssistant;
     m_memberSlots.push_back(member);
+        
+        SubGroupCounterIncrease(group);
 
     if(player)
@@ -1002 +1035 @@
     member_witerator slot = _getMemberWSlot(guid);
     if (slot != m_memberSlots.end())
+        {
+                SubGroupCounterDecrease(slot->group);
         m_memberSlots.erase(slot);
+        }
 
     if(!isBGGroup())
@@ -1095 +1131 @@
 }
 
-void Group::_convertToRaid()
-{
-    m_groupType = GROUPTYPE_RAID;
-
-    if(!isBGGroup()) CharacterDatabase.PExecute("UPDATE groups SET isRaid = 1 WHERE leaderGuid='%u'", GUID_LOPART(m_leaderGuid));
-}
-
 bool Group::_setMembersGroup(const uint64 &guid, const uint8 &group)
 {
@@ -1109 +1138 @@
 
     slot->group = group;
+        
+        SubGroupCounterIncrease(group);
+        
     if(!isBGGroup()) CharacterDatabase.PExecute("UPDATE group_member SET subgroup='%u' WHERE memberGuid='%u'", group, GUID_LOPART(guid));
+        
     return true;
 }
@@ -1165 +1198 @@
     if (!player)
     {
+                uint8 prevSubGroup;
+                prevSubGroup = GetMemberGroup(guid);
+                
+                SubGroupCounterDecrease(prevSubGroup);
+                
         if(_setMembersGroup(guid, group))
             SendUpdate();
     }
-    else ChangeMembersGroup(player, group);
+    else
+                ChangeMembersGroup(player, group);
 }
 
@@ -1178 +1217 @@
     if(_setMembersGroup(player->GetGUID(), group))
     {
+                uint8 prevSubGroup;
+                prevSubGroup = player->GetSubGroup();
+                
+                SubGroupCounterDecrease(prevSubGroup);
+                
         player->GetGroupRef().setSubGroup(group);
         SendUpdate();