[9579] Use ObjectGuid in some loot code.

Also use ObjectGuidSet instead std::set<ObjectGuid>
mangos · Mar 13, 2010 · 6e24375 · 6e24375 · Rosjha · Mar 13, 2010
1 parent 897906b
commit 6e24375
Show file tree

Hide file tree

Showing 13 changed files with 407 additions and 388 deletions.
diff --git a/src/game/GridNotifiers.cpp b/src/game/GridNotifiers.cpp
@@ -94,7 +94,7 @@ VisibleNotifier::Notify()
 
     // generate outOfRange for not iterate objects
     i_data.AddOutOfRangeGUID(i_clientGUIDs);
-    for(Player::ClientGUIDs::iterator itr = i_clientGUIDs.begin();itr!=i_clientGUIDs.end();++itr)
+    for(ObjectGuidSet::iterator itr = i_clientGUIDs.begin();itr!=i_clientGUIDs.end();++itr)
     {
         i_player.m_clientGUIDs.erase(*itr);
 
@@ -123,8 +123,8 @@ VisibleNotifier::Notify()
         i_player.GetSession()->SendPacket(&packet);
 
         // send out of range to other players if need
-        std::set<ObjectGuid> const& oor = i_data.GetOutOfRangeGUIDs();
-        for(std::set<ObjectGuid>::const_iterator iter = oor.begin(); iter != oor.end(); ++iter)
+        ObjectGuidSet const& oor = i_data.GetOutOfRangeGUIDs();
+        for(ObjectGuidSet::const_iterator iter = oor.begin(); iter != oor.end(); ++iter)
         {
             if(!iter->IsPlayer())
                 continue;

diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h
@@ -50,7 +50,7 @@ namespace MaNGOS
         Player &i_player;
         UpdateData i_data;
         UpdateDataMapType i_data_updates;
-        Player::ClientGUIDs i_clientGUIDs;
+        ObjectGuidSet i_clientGUIDs;
         std::set<WorldObject*> i_visibleNow;
 
         explicit VisibleNotifier(Player &player) : i_player(player),i_clientGUIDs(player.m_clientGUIDs) {}

diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp
diff --git a/src/game/ObjectGuid.h b/src/game/ObjectGuid.h
@@ -75,9 +75,7 @@ enum HighGuid
 #define IS_PLAYER_GUID(Guid)         ( GUID_HIPART(Guid) == HIGHGUID_PLAYER && Guid!=0 )
 #define IS_UNIT_GUID(Guid)           ( IS_CREATURE_OR_PET_GUID(Guid) || IS_PLAYER_GUID(Guid) )
                                                             // special case for empty guid need check
-#define IS_ITEM_GUID(Guid)           ( GUID_HIPART(Guid) == HIGHGUID_ITEM )
 #define IS_GAMEOBJECT_GUID(Guid)     ( GUID_HIPART(Guid) == HIGHGUID_GAMEOBJECT )
-#define IS_CORPSE_GUID(Guid)         ( GUID_HIPART(Guid) == HIGHGUID_CORPSE )
 #define IS_MO_TRANSPORT(Guid)        ( GUID_HIPART(Guid) == HIGHGUID_MO_TRANSPORT )
 
 // l - OBJECT_FIELD_GUID
@@ -233,6 +231,8 @@ class ObjectGuid
         uint64 m_guid;
 };
 
+typedef std::set<ObjectGuid> ObjectGuidSet;
+
 class PackedGuid
 {
     friend ByteBuffer& operator<< (ByteBuffer& buf, PackedGuid const& guid);