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

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.h (modified) (13 diffs)

trunk/src/game/Group.h

@@ -184 +184 @@
 
         // member manipulation methods
-        bool IsMember(uint64 guid) const { return _getMemberCSlot(guid) != m_memberSlots.end(); }
-        bool IsLeader(uint64 guid) const { return (GetLeaderGUID() == guid); }
+        bool IsMember(const uint64& guid) const { return _getMemberCSlot(guid) != m_memberSlots.end(); }
+                bool IsLeader(const uint64& guid) const { return (GetLeaderGUID() == guid); }
         bool IsAssistant(uint64 guid) const
         {
@@ -195 +195 @@
         }
 
-        bool SameSubGroup(uint64 guid1, uint64 guid2) const
+        bool SameSubGroup(uint64 guid1,const uint64& guid2) const
         {
             member_citerator mslot2 = _getMemberCSlot(guid2);
@@ -212 +212 @@
             return (mslot1->group==slot2->group);
         }
+                
+                bool HasFreeSlotSubGroup(uint8 subgroup) const
+                {
+                        return (m_subGroupsCounts && m_subGroupsCounts[subgroup] < MAXGROUPSIZE);
+                }
 
         bool SameSubGroup(Player const* member1, Player const* member2) const;
@@ -229 +234 @@
 
         // some additional raid methods
-        void ConvertToRaid()
-        {
-            _convertToRaid();
-            SendUpdate();
-        }
+        void ConvertToRaid();
+
         void SetBattlegroundGroup(BattleGround *bg) { m_bgGroup = bg; }
         uint32 CanJoinBattleGroundQueue(uint32 bgTypeId, uint32 bgQueueType, uint32 MinPlayerCount, uint32 MaxPlayerCount, bool isRated, uint32 arenaSlot);
@@ -240 +242 @@
         void ChangeMembersGroup(Player *player, const uint8 &group);
 
-        void SetAssistant(const uint64 &guid, const bool &state)
+        void SetAssistant(uint64 guid, const bool &state)
         {
             if(!isRaidGroup())
@@ -247 +249 @@
                 SendUpdate();
         }
-        void SetMainTank(const uint64 &guid)
+        void SetMainTank(uint64 guid)
         {
             if(!isRaidGroup())
@@ -255 +257 @@
                 SendUpdate();
         }
-        void SetMainAssistant(const uint64 &guid)
+        void SetMainAssistant(uint64 guid)
         {
             if(!isRaidGroup())
@@ -286 +288 @@
 
         void SendLootStartRoll(uint32 CountDown, const Roll &r);
-        void SendLootRoll(uint64 SourceGuid, uint64 TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r);
-        void SendLootRollWon(uint64 SourceGuid, uint64 TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r);
+        void SendLootRoll(const uint64& SourceGuid, const uint64& TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r);
+        void SendLootRollWon(const uint64& SourceGuid, const uint64& TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r);
         void SendLootAllPassed(uint32 NumberOfPlayers, const Roll &r);
-        void GroupLoot(uint64 playerGUID, Loot *loot, Creature *creature);
-        void NeedBeforeGreed(uint64 playerGUID, Loot *loot, Creature *creature);
-        void MasterLoot(uint64 playerGUID, Loot *loot, Creature *creature);
+        void GroupLoot(const uint64& playerGUID, Loot *loot, Creature *creature);
+                void NeedBeforeGreed(const uint64& playerGUID, Loot *loot, Creature *creature);
+                void MasterLoot(const uint64& playerGUID, Loot *loot, Creature *creature);
         Rolls::iterator GetRoll(uint64 Guid)
         {
@@ -305 +307 @@
         }
         void CountTheRoll(Rolls::iterator roll, uint32 NumberOfPlayers);
-        void CountRollVote(uint64 playerGUID, uint64 Guid, uint32 NumberOfPlayers, uint8 Choise);
+        void CountRollVote(const uint64& playerGUID, const uint64& Guid, uint32 NumberOfPlayers, uint8 Choise);
         void EndRoll();
 
@@ -324 +326 @@
         void _removeRolls(const uint64 &guid);
 
-        void _convertToRaid();
         bool _setMembersGroup(const uint64 &guid, const uint8 &group);
         bool _setAssistantFlag(const uint64 &guid, const bool &state);
@@ -331 +332 @@
 
         void _homebindIfInstance(Player *player);
+                
+                void _initRaidSubGroupsCounter()
+                {
+                        // Sub group counters initialization
+                        if (!m_subGroupsCounts)
+                                m_subGroupsCounts = new uint8[MAXRAIDSIZE / MAXGROUPSIZE];
+                                
+                        memset((void*)m_subGroupsCounts, 0, (MAXRAIDSIZE / MAXGROUPSIZE)*sizeof(uint8));
+                        
+                        for (member_citerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr)
+                                ++m_subGroupsCounts[itr->group];
+                }
 
         member_citerator _getMemberCSlot(uint64 Guid) const
@@ -351 +364 @@
             return m_memberSlots.end();
         }
+                
+                void SubGroupCounterIncrease(uint8 subgroup)
+                {
+                        if (m_subGroupsCounts)
+                                ++m_subGroupsCounts[subgroup];
+                }
+                
+                void SubGroupCounterDecrease(uint8 subgroup)
+                {
+                        if (m_subGroupsCounts)
+                                --m_subGroupsCounts[subgroup];
+                }
 
         MemberSlotList      m_memberSlots;
@@ -368 +393 @@
         Rolls               RollId;
         BoundInstancesMap   m_boundInstances[TOTAL_DIFFICULTIES];
+                uint8*              m_subGroupsCounts;
 };
 #endif